Convert KeyboardDrivenEventRewriter to a ui::EventRewriter.

chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
index c3ed4069f229769354c2ddc3bd73c6448999b3f5..7f0d1ce491177737cb052ee5f2b6af220e8716f2 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -112,6 +112,8 @@
 #if defined(USE_X11)
 #include "chrome/browser/chromeos/device_uma.h"
 #include "chrome/browser/chromeos/events/event_rewriter.h"
+#include "chrome/browser/chromeos/events/event_rewriter_controller.h"
+#include "chrome/browser/chromeos/events/keyboard_driven_event_rewriter.h"

[sadrul, 2014/04/23 19:32:53]

These should move out of the USE_X11 block?

[kpschoedel, 2014/04/23 21:33:15]

Done. Likewise event_rewriter.h in the other CL.

 #include "chrome/browser/chromeos/events/system_key_event_listener.h"
 #include "chrome/browser/chromeos/events/xinput_hierarchy_changed_event_listener.h"
 #endif
@@ -705,6 +707,9 @@ void ChromeBrowserMainPartsChromeos::PreBrowserStart() {
 
   event_rewriter_.reset(new EventRewriter());
 #endif
+  keyboard_event_rewriters_.reset(new EventRewriterController());
+  keyboard_event_rewriters_->AddEventRewriter(
+      scoped_ptr<ui::EventRewriter>(new KeyboardDrivenEventRewriter()).Pass());

[sadrul, 2014/04/23 19:33:56]

From your other CL, you don't need .Pass() here.

[kpschoedel, 2014/04/23 21:33:15]

Done.

 
   // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun()
   // -- immediately after ChildProcess::WaitForDebugger().
@@ -728,6 +733,7 @@ void ChromeBrowserMainPartsChromeos::PostBrowserStart() {
   // initialized.
   power_button_observer_.reset(new PowerButtonObserver);
   data_promo_notification_.reset(new DataPromoNotification()),
+  keyboard_event_rewriters_->Init();
 
   ChromeBrowserMainPartsLinux::PostBrowserStart();
 }
@@ -773,6 +779,7 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() {
   if (!KioskModeSettings::Get()->IsKioskModeEnabled())
     ScreenLocker::ShutDownClass();
 
+  keyboard_event_rewriters_->Shutdown();
 #if defined(USE_X11)
   event_rewriter_.reset();