Add a Printer log type to device log.
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation Change-Id: I58a89ddc8eefee21a65e0d176f45300a64604638 Reviewed-on: https://chromium-review.googlesource.com/1026794 Reviewed-by: Steven Bennetts <stevenjb@chromium.org> Commit-Queue: Sean Kau <skau@chromium.org> Cr-Commit-Position: refs/heads/master@{#553408}
This commit is contained in:
chrome
components/device_event_log
@ -10530,6 +10530,9 @@ For more information, visit our <ph name="BEGIN_LINK"><a target="_blank" href
|
||||
<message name="IDS_DEVICE_LOG_TYPE_HID" desc="Checkbox to enable showing events of type HID (Human Interface Device)">
|
||||
HID
|
||||
</message>
|
||||
<message name="IDS_DEVICE_LOG_TYPE_PRINTER" desc="Checkbox to enable showing events of type Printer">
|
||||
Printer
|
||||
</message>
|
||||
<message name="IDS_DEVICE_LOG_FILEINFO" desc="File info checkbox in device event log">
|
||||
File Info
|
||||
</message>
|
||||
|
@ -56,6 +56,10 @@
|
||||
<input id="log-type-hid" type="checkbox">
|
||||
<span>$i18n{logTypeHidText}</span>
|
||||
</label>
|
||||
<label>
|
||||
<input id="log-type-printer" type="checkbox">
|
||||
<span>$i18n{logTypePrinterText}</span>
|
||||
</label>
|
||||
<label>
|
||||
<input id="log-fileinfo" type="checkbox">
|
||||
<span>$i18n{logLevelFileinfoText}</span>
|
||||
|
@ -77,6 +77,7 @@ DeviceLogUI::DeviceLogUI(content::WebUI* web_ui)
|
||||
IDS_DEVICE_LOG_TYPE_BLUETOOTH);
|
||||
html->AddLocalizedString("logTypeUsbText", IDS_DEVICE_LOG_TYPE_USB);
|
||||
html->AddLocalizedString("logTypeHidText", IDS_DEVICE_LOG_TYPE_HID);
|
||||
html->AddLocalizedString("logTypePrinterText", IDS_DEVICE_LOG_TYPE_PRINTER);
|
||||
|
||||
html->AddLocalizedString("logEntryFormat", IDS_DEVICE_LOG_ENTRY);
|
||||
html->SetJsonPath("strings.js");
|
||||
|
@ -60,6 +60,9 @@
|
||||
#define MEMORY_LOG(level) \
|
||||
DEVICE_LOG(::device_event_log::LOG_TYPE_MEMORY, \
|
||||
::device_event_log::LOG_LEVEL_##level)
|
||||
#define PRINTER_LOG(level) \
|
||||
DEVICE_LOG(::device_event_log::LOG_TYPE_PRINTER, \
|
||||
::device_event_log::LOG_LEVEL_##level)
|
||||
|
||||
// Generally prefer the above macros unless |type| or |level| is not constant.
|
||||
|
||||
@ -101,8 +104,10 @@ enum LogType {
|
||||
LOG_TYPE_HID = 5,
|
||||
// Memory related events.
|
||||
LOG_TYPE_MEMORY = 6,
|
||||
// Printer related events.
|
||||
LOG_TYPE_PRINTER = 7,
|
||||
// Used internally, must be the last type (may be changed).
|
||||
LOG_TYPE_UNKNOWN = 7
|
||||
LOG_TYPE_UNKNOWN = 8
|
||||
};
|
||||
|
||||
// Used to specify the detail level for logging. In GetAsString, used to
|
||||
|
@ -33,6 +33,7 @@ const char* kLogTypeBluetoothDesc = "Bluetooth";
|
||||
const char* kLogTypeUsbDesc = "USB";
|
||||
const char* kLogTypeHidDesc = "HID";
|
||||
const char* kLogTypeMemoryDesc = "Memory";
|
||||
const char* kLogTypePrinterDesc = "Printer";
|
||||
|
||||
std::string GetLogTypeString(LogType type) {
|
||||
switch (type) {
|
||||
@ -50,6 +51,8 @@ std::string GetLogTypeString(LogType type) {
|
||||
return kLogTypeHidDesc;
|
||||
case LOG_TYPE_MEMORY:
|
||||
return kLogTypeMemoryDesc;
|
||||
case LOG_TYPE_PRINTER:
|
||||
return kLogTypePrinterDesc;
|
||||
case LOG_TYPE_UNKNOWN:
|
||||
break;
|
||||
}
|
||||
|
Reference in New Issue
Block a user