Add new InputDeviceManager interface.

chrome/browser/ui/webui/options/chromeos/keyboard_handler.cc

 // Copyright (c) 2012 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/ui/webui/options/chromeos/keyboard_handler.h"
 
 #include <stddef.h>
 
 #include "ash/new_window_delegate.h"
 #include "ash/shell.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/values.h"
 #include "chrome/grit/generated_resources.h"
 #include "chromeos/chromeos_switches.h"
 #include "content/public/browser/web_ui.h"
 #include "ui/base/ime/chromeos/ime_keyboard.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/events/devices/device_data_manager.h"
+#include "ui/events/devices/input_device_manager.h"
 
 namespace {
 const struct ModifierKeysSelectItem {
   int message_id;
   chromeos::input_method::ModifierKey value;
 } kModifierKeysSelectItems[] = {
   { IDS_OPTIONS_SETTINGS_LANGUAGES_KEY_SEARCH,
     chromeos::input_method::kSearchKey },
   { IDS_OPTIONS_SETTINGS_LANGUAGES_KEY_LEFT_CTRL,
     chromeos::input_method::kControlKey },
@@ skipping 12 matching lines @@
 const char* kDataValuesNames[] = {
   "remapSearchKeyToValue",
   "remapControlKeyToValue",
   "remapAltKeyToValue",
   "remapCapsLockKeyToValue",
   "remapDiamondKeyToValue",
 };
 
 bool HasExternalKeyboard() {
   for (const ui::InputDevice& keyboard :
-       ui::DeviceDataManager::GetInstance()->keyboard_devices()) {
+       ui::InputDeviceManager::GetInstance()->GetKeyboardDevices()) {
     if (keyboard.type == ui::InputDeviceType::INPUT_DEVICE_EXTERNAL)
       return true;
   }
 
   return false;
 }
 }  // namespace
 
 namespace chromeos {
 namespace options {
 
 KeyboardHandler::KeyboardHandler() {
-  ui::DeviceDataManager::GetInstance()->AddObserver(this);
+  ui::InputDeviceManager::GetInstance()->AddObserver(this);
 }
 
 KeyboardHandler::~KeyboardHandler() {
-  ui::DeviceDataManager::GetInstance()->RemoveObserver(this);
+  ui::InputDeviceManager::GetInstance()->RemoveObserver(this);
 }
 
 void KeyboardHandler::GetLocalizedValues(
     base::DictionaryValue* localized_strings) {
   DCHECK(localized_strings);
   RegisterTitle(localized_strings, "keyboardOverlay",
                 IDS_OPTIONS_KEYBOARD_OVERLAY_TITLE);
 
   localized_strings->SetString("remapSearchKeyToContent",
       l10n_util::GetStringUTF16(
@@ skipping 98 matching lines @@
 
 void KeyboardHandler::UpdateCapsLockOptions() const {
   const base::FundamentalValue show_caps_lock_options(HasExternalKeyboard());
   web_ui()->CallJavascriptFunction(
       "options.KeyboardOverlay.showCapsLockOptions",
       show_caps_lock_options);
 }
 
 }  // namespace options
 }  // namespace chromeos