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

Unified Diff: athena/input/accelerator_manager_impl.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
« no previous file with comments | « ash/shell.cc ('k') | athena/input/accelerator_manager_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/input/accelerator_manager_impl.h
diff --git a/athena/input/accelerator_manager_impl.h b/athena/input/accelerator_manager_impl.h
index f261263d2bea1256db4bdadc19214704c8bb3b94..bd0c9a751e35b4f54b9691e1254b034b3cc9d8b5 100644
--- a/athena/input/accelerator_manager_impl.h
+++ b/athena/input/accelerator_manager_impl.h
@@ -11,6 +11,7 @@
#include "base/macros.h"
#include "ui/base/accelerators/accelerator.h"
+#include "ui/base/accelerators/accelerator_history.h"
#include "ui/events/event_target_iterator.h"
namespace aura {
@@ -75,6 +76,7 @@ class AcceleratorManagerImpl : public AcceleratorManager,
std::map<ui::Accelerator, InternalData> accelerators_;
scoped_ptr<AcceleratorWrapper> accelerator_wrapper_;
+ scoped_ptr<ui::AcceleratorHistory> accelerator_history_;
scoped_ptr<wm::AcceleratorFilter> accelerator_filter_;
scoped_ptr<wm::NestedAcceleratorController> nested_accelerator_controller_;
bool debug_accelerators_enabled_;
« no previous file with comments | « ash/shell.cc ('k') | athena/input/accelerator_manager_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698