diff options
| author | kpschoedel@chromium.org <kpschoedel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-19 12:32:53 +0000 |
|---|---|---|
| committer | kpschoedel@chromium.org <kpschoedel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-19 12:32:53 +0000 |
| commit | 6d5f35330bcd619635829064e447dcdb767d19e0 (patch) | |
| tree | 347eb05296eed284af34fefdffb15bb764847c1c /ash/shell.cc | |
| parent | 0dade4d26f3c3a942b7f05458a4ef1c8137afb19 (diff) | |
| download | chromium_src-6d5f35330bcd619635829064e447dcdb767d19e0.zip chromium_src-6d5f35330bcd619635829064e447dcdb767d19e0.tar.gz chromium_src-6d5f35330bcd619635829064e447dcdb767d19e0.tar.bz2 | |
Convert sticky keys to a chromeos::EventRewriter phase.
BUG=354035
TEST=unit_tests,ash_unittests,manual
R=sadrul@chromium.org,derat@chromium.org
Review URL: https://codereview.chromium.org/255033003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@278342 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.cc')
| -rw-r--r-- | ash/shell.cc | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/ash/shell.cc b/ash/shell.cc index c8b3279..2c39306 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -889,13 +889,6 @@ void Shell::Init(const ShellInitParams& init_params) { // The order in which event filters are added is significant. -#if defined(OS_CHROMEOS) - // The StickyKeysController also rewrites events and must be added - // before observers, but after the EventRewriterEventFilter. - sticky_keys_controller_.reset(new StickyKeysController); - AddPreTargetHandler(sticky_keys_controller_.get()); -#endif - // wm::UserActivityDetector passes events to observers, so let them get // rewritten first. user_activity_detector_.reset(new ::wm::UserActivityDetector); @@ -930,6 +923,10 @@ void Shell::Init(const ShellInitParams& init_params) { keyboard::InitializeKeyboard(); #endif +#if defined(OS_CHROMEOS) + sticky_keys_controller_.reset(new StickyKeysController); +#endif + lock_state_controller_.reset(new LockStateController); power_button_controller_.reset(new PowerButtonController( lock_state_controller_.get())); |