ozone: Rename XKeyboard to KeyboardController & use fake under ozone

chrome/browser/chromeos/events/event_rewriter.cc

 // Copyright 2014 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/chromeos/events/event_rewriter.h"
 
 #include <X11/extensions/XInput2.h>
 #include <X11/keysym.h>
 #include <X11/XF86keysym.h>
 #include <X11/Xlib.h>
@@ skipping 10 matching lines @@
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_util.h"
 #include "base/sys_info.h"
 #include "chrome/browser/chromeos/events/keyboard_driven_event_rewriter.h"
 #include "chrome/browser/chromeos/events/xinput_hierarchy_changed_event_listener.h"
 #include "chrome/browser/chromeos/login/login_display_host_impl.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/pref_names.h"
 #include "chromeos/chromeos_switches.h"
+#include "chromeos/ime/ime_keyboard.h"
 #include "chromeos/ime/input_method_manager.h"
-#include "chromeos/ime/xkeyboard.h"
 #include "ui/base/x/x11_util.h"
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/keycodes/keyboard_code_conversion_x.h"
 #include "ui/events/platform/platform_event_source.h"
 #include "ui/wm/core/window_util.h"
 
 namespace {
 
 const int kBadDeviceId = -1;
@@ skipping 83 matching lines @@
       chromeos::input_method::InputMethodManager::Get();
   return manager->IsISOLevel5ShiftUsedByCurrentInputMethod();
 }
 
 }  // namespace
 
 namespace chromeos {
 
 EventRewriter::EventRewriter()
     : last_device_id_(kBadDeviceId),
-      xkeyboard_for_testing_(NULL),
+      keyboard_for_testing_(NULL),
       keyboard_driven_event_rewriter_(new KeyboardDrivenEventRewriter),
       pref_service_for_testing_(NULL) {
   ui::PlatformEventSource::GetInstance()->AddPlatformEventObserver(this);
   if (base::SysInfo::IsRunningOnChromeOS()) {
     XInputHierarchyChangedEventListener::GetInstance()->AddObserver(this);
   }
   RefreshKeycodes();
 }
 
 EventRewriter::~EventRewriter() {
@@ skipping 367 matching lines @@
   // Next, remap modifier bits.
   unsigned int remapped_native_modifiers = 0U;
   GetRemappedModifierMasks(xkey->state, &remapped_native_modifiers);
 
   // Toggle Caps Lock if the remapped key is ui::VKEY_CAPITAL, but do nothing if
   // the original key is ui::VKEY_CAPITAL (i.e. a Caps Lock key on an external
   // keyboard is pressed) since X can handle that case.
   if (event->type == KeyPress &&
       original_keycode != ui::VKEY_CAPITAL &&
       remapped_keycode == ui::VKEY_CAPITAL) {
-    input_method::XKeyboard* xkeyboard = xkeyboard_for_testing_ ?
-        xkeyboard_for_testing_ :
-        input_method::InputMethodManager::Get()->GetXKeyboard();
-    xkeyboard->SetCapsLockEnabled(!xkeyboard->CapsLockIsEnabled());
+    input_method::ImeKeyboard* keyboard = keyboard_for_testing_ ?
+        keyboard_for_testing_ :
+        input_method::InputMethodManager::Get()->GetImeKeyboard();
+    keyboard->SetCapsLockEnabled(!keyboard->CapsLockIsEnabled());
   }
 
   OverwriteEvent(event, remapped_native_keycode, remapped_native_modifiers);
   return true;
 }
 
 bool EventRewriter::RewriteNumPadKeys(XEvent* event) {
   DCHECK(event->type == KeyPress || event->type == KeyRelease);
   bool rewritten = false;
   XKeyEvent* xkey = &event->xkey;
@@ skipping 354 matching lines @@
     VLOG(1) << "Apple keyboard '" << device_name << "' connected: "
             << "id=" << device_id;
   }
   // Always overwrite the existing device_id since the X server may reuse a
   // device id for an unattached device.
   device_id_to_type_[device_id] = type;
   return type;
 }
 
 }  // namespace chromeos