Index: chrome/browser/chromeos/system_logs/touch_log_source_ozone.cc |
diff --git a/chrome/browser/chromeos/system_logs/touch_log_source_ozone.cc b/chrome/browser/chromeos/system_logs/touch_log_source_ozone.cc |
index 3e9f16524ca3b09afa34f637be703fbd256ced40..60e642a4c4fb351bef2fa30119b2668a339b3b39 100644 |
--- a/chrome/browser/chromeos/system_logs/touch_log_source_ozone.cc |
+++ b/chrome/browser/chromeos/system_logs/touch_log_source_ozone.cc |
@@ -12,6 +12,8 @@ |
#include "base/process/launch.h" |
#include "components/feedback/feedback_util.h" |
#include "content/public/browser/browser_thread.h" |
+#include "ui/ozone/public/input_controller.h" |
+#include "ui/ozone/public/ozone_platform.h" |
using content::BrowserThread; |
@@ -19,6 +21,11 @@ namespace { |
const char kHUDLogDataKey[] = "hud_log"; |
+// The prefix "hack-33025" was historically chosen in http://crbug.com/139715. |
+// We continue to go with it in order to be compatible with the existing touch |
+// log processing toolchain. |
+const char kDeviceStatusLogDataKey[] = "hack-33025-touchpad"; |
+ |
void GetTouchLogsOzone(system_logs::SystemLogsResponse* response) { |
scoped_ptr<base::DictionaryValue> dictionary = |
ash::TouchHudDebug::GetAllAsDictionary(); |
@@ -30,9 +37,9 @@ void GetTouchLogsOzone(system_logs::SystemLogsResponse* response) { |
(*response)[kHUDLogDataKey] = touch_log; |
} |
- // TODO(sheckylin): Add ozone touch log collection implementation. See |
- // http://crbug.com/400022. |
- NOTIMPLEMENTED(); |
+ (*response)[kDeviceStatusLogDataKey] = ui::OzonePlatform::GetInstance() |
+ ->GetInputController() |
+ ->GetGestureDeviceStatus(); |
} |
} // namespace |