| 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 75a7370ce89a3cbc2d24caaac352265b346eed14..f8bbdc52a1c710319f430f64303c34671f49d5a5 100644
|
| --- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| +++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| @@ -11,6 +11,7 @@
|
| #include <vector>
|
|
|
| #include "ash/shell.h"
|
| +#include "ash/sticky_keys/sticky_keys_controller.h"
|
| #include "base/bind.h"
|
| #include "base/callback.h"
|
| #include "base/command_line.h"
|
| @@ -43,8 +44,8 @@
|
| #include "chrome/browser/chromeos/dbus/mus_console_service_provider_delegate.h"
|
| #include "chrome/browser/chromeos/dbus/screen_lock_service_provider.h"
|
| #include "chrome/browser/chromeos/display/quirks_manager_delegate_impl.h"
|
| -#include "chrome/browser/chromeos/events/event_rewriter.h"
|
| #include "chrome/browser/chromeos/events/event_rewriter_controller.h"
|
| +#include "chrome/browser/chromeos/events/event_rewriter_delegate_impl.h"
|
| #include "chrome/browser/chromeos/events/keyboard_driven_event_rewriter.h"
|
| #include "chrome/browser/chromeos/extensions/default_app_order.h"
|
| #include "chrome/browser/chromeos/extensions/extension_volume_observer.h"
|
| @@ -158,6 +159,8 @@
|
| #include "ui/base/ime/chromeos/ime_keyboard.h"
|
| #include "ui/base/ime/chromeos/input_method_manager.h"
|
| #include "ui/base/touch/touch_device.h"
|
| +#include "ui/chromeos/events/event_rewriter.h"
|
| +#include "ui/chromeos/pref_names.h"
|
| #include "ui/events/event_utils.h"
|
|
|
| #if BUILDFLAG(ENABLE_RLZ)
|
| @@ -804,9 +807,11 @@ void ChromeBrowserMainPartsChromeos::PostBrowserStart() {
|
| std::unique_ptr<ui::EventRewriter>(new KeyboardDrivenEventRewriter()));
|
| keyboard_event_rewriters_->AddEventRewriter(
|
| std::unique_ptr<ui::EventRewriter>(new SpokenFeedbackEventRewriter()));
|
| + event_rewriter_delegate_ = base::MakeUnique<EventRewriterDelegateImpl>();
|
| keyboard_event_rewriters_->AddEventRewriter(
|
| - std::unique_ptr<ui::EventRewriter>(new EventRewriter(
|
| - ash::Shell::GetInstance()->sticky_keys_controller())));
|
| + base::MakeUnique<ui::chromeos::EventRewriter>(
|
| + event_rewriter_delegate_.get(),
|
| + ash::Shell::GetInstance()->sticky_keys_controller()));
|
| keyboard_event_rewriters_->Init();
|
| }
|
|
|
|
|