Add new InputDeviceManager interface.

chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 28 matching lines @@
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 #include <gnu/libc-version.h>
 
 #include "base/version.h"
 #if defined(USE_X11)
 #include "ui/base/x/x11_util.h"
 #endif
 #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)
 #include "base/win/windows_version.h"
 #include "chrome/installer/util/google_update_settings.h"
 #endif  // defined(OS_WIN)
 
 namespace {
 
 enum UMALinuxGlibcVersion {
@@ skipping 220 matching lines @@
   ~AsynchronousTouchEventStateRecorder() override;
 
   // ui::InputDeviceEventObserver overrides.
   void OnDeviceListsComplete() override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(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();
 }
 
 #endif  // defined(USE_OZONE) || defined(USE_X11)
 
 }  // namespace
 
 ChromeBrowserMainExtraPartsMetrics::ChromeBrowserMainExtraPartsMetrics()
     : display_count_(0), is_screen_observer_(false) {
 }
@@ skipping 18 matching lines @@
 #if defined(USE_X11) && !defined(OS_CHROMEOS)
   UMA_HISTOGRAM_ENUMERATION("Linux.WindowManager",
                             GetLinuxWindowManager(),
                             UMA_LINUX_WINDOW_MANAGER_COUNT);
 #endif
 
 #if defined(USE_OZONE) || defined(USE_X11)
   // 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(
         new AsynchronousTouchEventStateRecorder());
   }
 #else
   RecordTouchEventState();
 #endif  // defined(USE_OZONE) || defined(USE_X11)
 
 #if defined(OS_MACOSX)
@@ skipping 38 matching lines @@
   }
 }
 
 namespace chrome {
 
 void AddMetricsExtraParts(ChromeBrowserMainParts* main_parts) {
   main_parts->AddParts(new ChromeBrowserMainExtraPartsMetrics());
 }
 
 }  // namespace chrome