| 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 03c85717b218ea4e62a0a73559a9cae22715532b..fa32096034d392640984ef88faa047cd8a50c479 100644
|
| --- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| +++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| @@ -730,6 +730,11 @@
|
| // Start the CrOS input device UMA watcher
|
| DeviceUMA::GetInstance();
|
| #endif
|
| + keyboard_event_rewriters_.reset(new EventRewriterController());
|
| + keyboard_event_rewriters_->AddEventRewriter(
|
| + scoped_ptr<ui::EventRewriter>(new KeyboardDrivenEventRewriter()));
|
| + keyboard_event_rewriters_->AddEventRewriter(
|
| + scoped_ptr<ui::EventRewriter>(new EventRewriter()));
|
|
|
| // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun()
|
| // -- immediately after ChildProcess::WaitForDebugger().
|
| @@ -752,13 +757,7 @@
|
| // These are dependent on the ash::Shell singleton already having been
|
| // initialized.
|
| power_button_observer_.reset(new PowerButtonObserver);
|
| - data_promo_notification_.reset(new DataPromoNotification());
|
| -
|
| - keyboard_event_rewriters_.reset(new EventRewriterController());
|
| - keyboard_event_rewriters_->AddEventRewriter(
|
| - scoped_ptr<ui::EventRewriter>(new KeyboardDrivenEventRewriter()));
|
| - keyboard_event_rewriters_->AddEventRewriter(scoped_ptr<ui::EventRewriter>(
|
| - new EventRewriter(ash::Shell::GetInstance()->sticky_keys_controller())));
|
| + data_promo_notification_.reset(new DataPromoNotification()),
|
| keyboard_event_rewriters_->Init();
|
|
|
| ChromeBrowserMainPartsLinux::PostBrowserStart();
|
|
|