Move IME shortcut keys from X to Aura [part 1 of 3].

ash/shell.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/shell.h"
 
 #include <algorithm>
 
 #include "ash/app_list/app_list.h"
 #include "ash/ash_switches.h"
@@ skipping 273 matching lines @@
 }
 
 void Shell::Init() {
   DCHECK(!GetRootWindowEventFilterCount());
 
   // PartialScreenshotEventFilter must be the first one to capture key
   // events when the taking partial screenshot UI is there.
   partial_screenshot_filter_.reset(new internal::PartialScreenshotEventFilter);
   AddRootWindowEventFilter(partial_screenshot_filter_.get());
 
-  // InputMethodEventFilter must be added next to PartialScreenshot
-  // since it has the higher priority.
+  // Then AcceleratorFilter and InputMethodEventFilter must be added (in this
+  // order) since they have the second highest priority.
+  DCHECK_EQ(1U, GetRootWindowEventFilterCount());
+#if !defined(OS_MACOSX)
+  accelerator_filter_.reset(new internal::AcceleratorFilter);
+  AddRootWindowEventFilter(accelerator_filter_.get());
+  DCHECK_EQ(2U, GetRootWindowEventFilterCount());
+#endif
   input_method_filter_.reset(new internal::InputMethodEventFilter);
   AddRootWindowEventFilter(input_method_filter_.get());
 
   // Dynamic window mode affects window mode computation.
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   dynamic_window_mode_ = command_line->HasSwitch(
       switches::kAuraDynamicWindowMode);
 
   // Window mode must be set before computing containers or layout managers.
   gfx::Size monitor_size = gfx::Screen::GetPrimaryMonitorSize();
@@ skipping 42 matching lines @@
 
   // Force a layout.
   root_window->layout_manager()->OnWindowResized();
 
   window_modality_controller_.reset(new internal::WindowModalityController);
   AddRootWindowEventFilter(window_modality_controller_.get());
 
   visibility_controller_.reset(new internal::VisibilityController);
   aura::client::SetVisibilityClient(visibility_controller_.get());
 
-#if !defined(OS_MACOSX)
-  accelerator_filter_.reset(new internal::AcceleratorFilter);
-  AddRootWindowEventFilter(accelerator_filter_.get());
-#endif
-
   tooltip_controller_.reset(new internal::TooltipController);
   AddRootWindowEventFilter(tooltip_controller_.get());
   aura::client::SetTooltipClient(tooltip_controller_.get());
 
   drag_drop_controller_.reset(new internal::DragDropController);
   power_button_controller_.reset(new PowerButtonController);
   video_detector_.reset(new VideoDetector);
   window_cycle_controller_.reset(new WindowCycleController);
 }
 
@@ skipping 224 matching lines @@
   // Create the desktop background image.
   root_window_layout_->SetBackgroundWidget(internal::CreateDesktopBackground());
   root_window_layout_->SetBackgroundLayer(NULL);
 }
 
 void Shell::ResetLayoutManager(int container_id) {
   GetContainer(container_id)->SetLayoutManager(NULL);
 }
 
 }  // namespace ash