| 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 adf3739298038f267d447494a72a011875deaea8..185a9573321e8f67418bcc0c76dba41f2bd4df88 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"
|
| #include "chrome/browser/chromeos/events/system_key_event_listener.h"
|
| #include "chrome/browser/chromeos/events/xinput_hierarchy_changed_event_listener.h"
|
| #endif
|
| @@ -706,6 +708,8 @@ void ChromeBrowserMainPartsChromeos::PreBrowserStart() {
|
| DeviceUMA::GetInstance();
|
|
|
| event_rewriter_.reset(new EventRewriter());
|
| + keyboard_driven_event_rewriter_.reset(
|
| + new EventRewriterController(new KeyboardDrivenEventRewriter()));
|
| #endif
|
|
|
| // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun()
|
| @@ -731,6 +735,10 @@ void ChromeBrowserMainPartsChromeos::PostBrowserStart() {
|
| power_button_observer_.reset(new PowerButtonObserver);
|
| data_promo_notification_.reset(new DataPromoNotification()),
|
|
|
| +#if defined(USE_X11)
|
| + keyboard_driven_event_rewriter_->Init();
|
| +#endif
|
| +
|
| ChromeBrowserMainPartsLinux::PostBrowserStart();
|
| }
|
|
|
| @@ -776,6 +784,7 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() {
|
| ScreenLocker::ShutDownClass();
|
|
|
| #if defined(USE_X11)
|
| + keyboard_driven_event_rewriter_.reset();
|
| event_rewriter_.reset();
|
|
|
| // The XInput2 event listener needs to be shut down earlier than when
|
|
|