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

Unified Diff: athena/input/accelerator_manager_impl.cc

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: athena/input/accelerator_manager_impl.cc
diff --git a/athena/input/accelerator_manager_impl.cc b/athena/input/accelerator_manager_impl.cc
index ad0302308825974ae9c37587443d046e2183e95c..c1e037a40df29890775f362b7ffbf77d38b9881d 100644
--- a/athena/input/accelerator_manager_impl.cc
+++ b/athena/input/accelerator_manager_impl.cc
@@ -262,7 +262,8 @@ void AcceleratorManagerImpl::Init() {
new AcceleratorDelegate(this));
accelerator_filter_.reset(
- new wm::AcceleratorFilter(accelerator_delegate.Pass()));
+ new wm::AcceleratorFilter(accelerator_delegate.Pass(),
+ accelerator_history_.get()));
toplevel->AddPreTargetHandler(accelerator_filter_.get());
}
@@ -289,6 +290,7 @@ AcceleratorManagerImpl::AcceleratorManagerImpl(
AcceleratorWrapper* accelerator_wrapper,
bool global)
: accelerator_wrapper_(accelerator_wrapper),
+ accelerator_history_(new ui::AcceleratorHistory),
debug_accelerators_enabled_(switches::IsDebugAcceleratorsEnabled()),
global_(global) {
}
« no previous file with comments | « athena/input/accelerator_manager_impl.h ('k') | chrome/browser/chromeos/accessibility/sticky_keys_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698