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

Unified Diff: ui/wm/core/accelerator_filter.h

Issue 727583002: Regression: Search+Key pops up app launcher (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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: ui/wm/core/accelerator_filter.h
diff --git a/ui/wm/core/accelerator_filter.h b/ui/wm/core/accelerator_filter.h
index 44579efa04348c9683404de9ff779ca9e200e53d..7f1c3ac7bc97840c1e2584089a4ccecd196a6e48 100644
--- a/ui/wm/core/accelerator_filter.h
+++ b/ui/wm/core/accelerator_filter.h
@@ -12,6 +12,7 @@
namespace ui {
class Accelerator;
+class AcceleratorHistory;
}
namespace wm {
@@ -21,7 +22,8 @@ class AcceleratorDelegate;
// keyboard accelerators.
class WM_EXPORT AcceleratorFilter : public ui::EventHandler {
public:
- AcceleratorFilter(scoped_ptr<AcceleratorDelegate> delegate);
+ AcceleratorFilter(scoped_ptr<AcceleratorDelegate> delegate,
+ ui::AcceleratorHistory* accelerator_history);
~AcceleratorFilter() override;
// Overridden from ui::EventHandler:
@@ -29,6 +31,7 @@ class WM_EXPORT AcceleratorFilter : public ui::EventHandler {
private:
scoped_ptr<AcceleratorDelegate> delegate_;
+ ui::AcceleratorHistory* accelerator_history_;
DISALLOW_COPY_AND_ASSIGN(AcceleratorFilter);
};

Powered by Google App Engine
This is Rietveld 408576698