Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(979)

Unified Diff: ash/shell.cc

Issue 118543002: Move sticky keys files to their own directory and rename to StickyKeysController. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: update ash.gyp Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/shell.h ('k') | ash/sticky_keys/OWNERS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index 607601db082272f5133d64297114866d96dcef2b..1979f99a550ab62a9c3894829cb37f3e8d506982 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -128,12 +128,12 @@
#include "content/public/browser/gpu_data_manager.h"
#include "gpu/config/gpu_feature_type.h"
#endif // defined(USE_X11)
+#include "ash/sticky_keys/sticky_keys_controller.h"
#include "ash/system/chromeos/brightness/brightness_controller_chromeos.h"
#include "ash/system/chromeos/power/power_event_observer.h"
#include "ash/system/chromeos/power/power_status.h"
#include "ash/system/chromeos/power/user_activity_notifier.h"
#include "ash/system/chromeos/power/video_activity_notifier.h"
-#include "ash/wm/sticky_keys.h"
#endif // defined(OS_CHROMEOS)
namespace ash {
@@ -801,10 +801,10 @@ void Shell::Init() {
AddPreTargetHandler(event_rewriter_filter_.get());
#if defined(OS_CHROMEOS)
- // The StickyKeys event filter also rewrites events and must be added
+ // The StickyKeysController also rewrites events and must be added
// before observers, but after the EventRewriterEventFilter.
- sticky_keys_.reset(new StickyKeys);
- AddPreTargetHandler(sticky_keys_.get());
+ sticky_keys_controller_.reset(new StickyKeysController);
+ AddPreTargetHandler(sticky_keys_controller_.get());
#endif
// UserActivityDetector passes events to observers, so let them get
« no previous file with comments | « ash/shell.h ('k') | ash/sticky_keys/OWNERS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698