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

Unified Diff: chrome/browser/chromeos/events/event_rewriter.h

Issue 2731283004: Do not use ash in chromeos::EventRewriter. (Closed)
Patch Set: Address review issues. Created 3 years, 9 months 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
Index: chrome/browser/chromeos/events/event_rewriter.h
diff --git a/chrome/browser/chromeos/events/event_rewriter.h b/chrome/browser/chromeos/events/event_rewriter.h
index afb4d6f65ef66b33006518db1d2e94f3005d947a..e887a2c8707df412425cbecf8e66d1db9970a359 100644
--- a/chrome/browser/chromeos/events/event_rewriter.h
+++ b/chrome/browser/chromeos/events/event_rewriter.h
@@ -19,10 +19,6 @@
class PrefService;
-namespace ash {
-class StickyKeysController;
-}
-
namespace ui {
enum class DomCode;
};
@@ -62,7 +58,7 @@ class EventRewriter : public ui::EventRewriter {
// Does not take ownership of the |sticky_keys_controller|, which may also
// be NULL (for testing without ash), in which case sticky key operations
// don't happen.
- explicit EventRewriter(ash::StickyKeysController* sticky_keys_controller);
+ explicit EventRewriter(ui::EventRewriter* sticky_keys_controller);
~EventRewriter() override;
// Calls KeyboardDeviceAddedInternal.
@@ -179,7 +175,7 @@ class EventRewriter : public ui::EventRewriter {
// The sticky keys controller is not owned here;
// at time of writing it is a singleton in ash::Shell.
- ash::StickyKeysController* sticky_keys_controller_;
+ ui::EventRewriter* const sticky_keys_controller_;
// Some keyboard layouts have 'latching' keys, which either apply
// a modifier while held down (like normal modifiers), or, if no

Powered by Google App Engine
This is Rietveld 408576698