Convert KeyboardDrivenEventRewriter to a ui::EventRewriter.

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>
 // Get rid of macros from Xlib.h that conflicts with other parts of the code.
 #undef RootWindow
 #undef Status
 
 #include <vector>
 
 #include "ash/wm/window_state.h"
 #include "ash/wm/window_util.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #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 "ui/base/x/x11_util.h"
 #include "ui/events/event.h"
@@ skipping 92 matching lines @@
   return manager->IsISOLevel5ShiftUsedByCurrentInputMethod();
 }
 
 }  // namespace
 
 namespace chromeos {
 
 EventRewriter::EventRewriter()
     : last_device_id_(kBadDeviceId),
       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() {
   ui::PlatformEventSource::GetInstance()->RemovePlatformEventObserver(this);
@@ skipping 187 matching lines @@
   Profile* profile = ProfileManager::GetActiveUserProfile();
   return profile ? profile->GetPrefs() : NULL;
 }
 
 void EventRewriter::Rewrite(XEvent* event) {
   // Do not rewrite an event sent by ui_controls::SendKeyPress(). See
   // crbug.com/136465.
   if (event->xkey.send_event)
     return;
 
-  // Keyboard driven rewriting happen first. Skip further processing if event is
-  // changed.
-  if (keyboard_driven_event_rewriter_->RewriteIfKeyboardDrivenOnLoginScreen(
-          event)) {
-    return;
-  }
-
   RewriteModifiers(event);
   RewriteNumPadKeys(event);
   RewriteExtendedKeys(event);
   RewriteFunctionKeys(event);
 }
 
 bool EventRewriter::IsAppleKeyboard() const {
   if (last_device_id_ == kBadDeviceId)
     return false;
 
@@ skipping 530 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