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

Unified Diff: ash/shell.cc

Issue 10155015: Process all global shortcuts for Ash after InputMethodEventFilter (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review Created 8 years, 8 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: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index 4fbc9ef8f41cd8cb6659c327a7bd00583829442d..e985684a391648295279158ff07ee076c64e93f0 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -651,16 +651,15 @@ void Shell::Init() {
AddRootWindowEventFilter(partial_screenshot_filter_.get());
AddShellObserver(partial_screenshot_filter_.get());
- // Then AcceleratorFilter and InputMethodEventFilter must be added (in this
- // order) since they have the second highest priority.
+ // InputMethodEventFilter must be the third one. It has to be added before
+ // AcceleratorFilter.
DCHECK_EQ(2U, GetRootWindowEventFilterCount());
+ input_method_filter_.reset(new internal::InputMethodEventFilter);
+ AddRootWindowEventFilter(input_method_filter_.get());
#if !defined(OS_MACOSX)
accelerator_filter_.reset(new internal::AcceleratorFilter);
AddRootWindowEventFilter(accelerator_filter_.get());
- DCHECK_EQ(3U, GetRootWindowEventFilterCount());
#endif
- input_method_filter_.reset(new internal::InputMethodEventFilter);
- AddRootWindowEventFilter(input_method_filter_.get());
system_gesture_filter_.reset(new internal::SystemGestureEventFilter);
AddRootWindowEventFilter(system_gesture_filter_.get());

Powered by Google App Engine
This is Rietveld 408576698