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

Unified Diff: ash/shell.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: ash/shell.h
diff --git a/ash/shell.h b/ash/shell.h
index 028609705d7405ce3e6579a25f3444abdb95d0a9..1b87d2872e37555c32f2d1d842e5d455b9536663 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -21,6 +21,7 @@
#include "base/memory/weak_ptr.h"
#include "base/observer_list.h"
#include "ui/aura/window.h"
+#include "ui/base/accelerators/accelerator_history.h"
#include "ui/base/ui_base_types.h"
#include "ui/events/event_target.h"
#include "ui/gfx/insets.h"
@@ -699,6 +700,9 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
// An event filter which handles system level gestures
scoped_ptr<SystemGestureEventFilter> system_gesture_filter_;
+ // A tracker for the current and previous accelerators.
+ scoped_ptr<ui::AcceleratorHistory> accelerator_history_;
+
// An event filter that pre-handles global accelerators.
scoped_ptr< ::wm::AcceleratorFilter> accelerator_filter_;

Powered by Google App Engine
This is Rietveld 408576698