Sticky keys modifies mouse click and scroll events in addition to key events.

Also refactor StickyKeys to be an EventHandler itself.

BUG=308659, 308662
TEST=enable existing interactive_ui_test case and manual testing

Review URL: https://codereview.chromium.org/60013011

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233744 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 0 deletions

diff --git a/ash/shell.h b/ash/shell.h
index fa54faa..fb4dd08c 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -103,6 +103,7 @@ class ScreenAsh;
 class SessionStateDelegate;
 class ShellDelegate;
 class ShellObserver;
+class StickyKeys;
 class SystemTray;
 class SystemTrayDelegate;
 class SystemTrayNotifier;
@@ -523,6 +524,10 @@ class ASH_EXPORT Shell
   // Creates instance of FirstRunHelper. Caller is responsible for deleting
   // returned object.
   ash::FirstRunHelper* CreateFirstRunHelper();
+
+  StickyKeys* sticky_keys() {
+    return sticky_keys_.get();
+  }
 #endif  // defined(OS_CHROMEOS)
 
  private:
@@ -662,6 +667,7 @@ class ASH_EXPORT Shell
   scoped_ptr<internal::PowerEventObserver> power_event_observer_;
   scoped_ptr<internal::UserActivityNotifier> user_activity_notifier_;
   scoped_ptr<internal::VideoActivityNotifier> video_activity_notifier_;
+  scoped_ptr<StickyKeys> sticky_keys_;
 #if defined(USE_X11)
   // Controls video output device state.
   scoped_ptr<chromeos::OutputConfigurator> output_configurator_;