Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1369)

Unified Diff: chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc

Issue 2028593004: Add new InputDeviceManager interface. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@remove_keyboard
Patch Set: Fix windows compile error. Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
diff --git a/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc b/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
index 4c343f28538f32e08faf7f66bf642ef99bab2c7c..281945d5632b740b9d39d69e3894c66a87a1cf74 100644
--- a/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
+++ b/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
@@ -46,8 +46,8 @@
#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)
#if defined(USE_OZONE) || defined(USE_X11)
-#include "ui/events/devices/device_data_manager.h"
#include "ui/events/devices/input_device_event_observer.h"
+#include "ui/events/devices/input_device_manager.h"
#endif // defined(USE_OZONE) || defined(USE_X11)
#if defined(OS_WIN)
@@ -288,15 +288,15 @@ class AsynchronousTouchEventStateRecorder
};
AsynchronousTouchEventStateRecorder::AsynchronousTouchEventStateRecorder() {
- ui::DeviceDataManager::GetInstance()->AddObserver(this);
+ ui::InputDeviceManager::GetInstance()->AddObserver(this);
}
AsynchronousTouchEventStateRecorder::~AsynchronousTouchEventStateRecorder() {
- ui::DeviceDataManager::GetInstance()->RemoveObserver(this);
+ ui::InputDeviceManager::GetInstance()->RemoveObserver(this);
}
void AsynchronousTouchEventStateRecorder::OnDeviceListsComplete() {
- ui::DeviceDataManager::GetInstance()->RemoveObserver(this);
+ ui::InputDeviceManager::GetInstance()->RemoveObserver(this);
RecordTouchEventState();
}
@@ -335,7 +335,7 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserStart() {
// The touch event state for X11 and Ozone based event sub-systems are based
// on device scans that happen asynchronously. So we may need to attach an
// observer to wait until these scans complete.
- if (ui::DeviceDataManager::GetInstance()->device_lists_complete()) {
+ if (ui::InputDeviceManager::GetInstance()->AreDeviceListsComplete()) {
RecordTouchEventState();
} else {
input_device_event_observer_.reset(

Powered by Google App Engine
This is Rietveld 408576698