aura/ash split: Moves RootWindowEventFilter and InputMethodEventFilter to ui/aura/.

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 <string>
 
 #include "ash/ash_switches.h"
 #include "ash/desktop_background/desktop_background_controller.h"
 #include "ash/desktop_background/desktop_background_resources.h"
 #include "ash/desktop_background/desktop_background_view.h"
 #include "ash/drag_drop/drag_drop_controller.h"
 #include "ash/focus_cycler.h"
-#include "ash/ime/input_method_event_filter.h"
 #include "ash/launcher/launcher.h"
 #include "ash/magnifier/magnification_controller.h"
 #include "ash/monitor/monitor_controller.h"
 #include "ash/monitor/multi_monitor_manager.h"
 #include "ash/screen_ash.h"
 #include "ash/shell_context_menu.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell_factory.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/bluetooth/bluetooth_observer.h"
 #include "ash/system/network/network_observer.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/tooltips/tooltip_controller.h"
 #include "ash/wm/activation_controller.h"
 #include "ash/wm/app_list_controller.h"
 #include "ash/wm/base_layout_manager.h"
 #include "ash/wm/custom_frame_view_ash.h"
 #include "ash/wm/dialog_frame_view.h"
 #include "ash/wm/event_client_impl.h"
 #include "ash/wm/key_rewriter_event_filter.h"
 #include "ash/wm/panel_layout_manager.h"
 #include "ash/wm/panel_window_event_filter.h"
 #include "ash/wm/partial_screenshot_event_filter.h"
 #include "ash/wm/power_button_controller.h"
 #include "ash/wm/resize_shadow_controller.h"
-#include "ash/wm/root_window_event_filter.h"
 #include "ash/wm/root_window_layout_manager.h"
 #include "ash/wm/screen_dimmer.h"
 #include "ash/wm/shadow_controller.h"
 #include "ash/wm/shelf_layout_manager.h"
 #include "ash/wm/stacking_controller.h"
 #include "ash/wm/status_area_layout_manager.h"
 #include "ash/wm/system_gesture_event_filter.h"
 #include "ash/wm/system_modal_container_layout_manager.h"
 #include "ash/wm/toplevel_window_event_filter.h"
 #include "ash/wm/video_detector.h"
 #include "ash/wm/visibility_controller.h"
 #include "ash/wm/window_cycle_controller.h"
 #include "ash/wm/window_modality_controller.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/workspace/workspace_event_filter.h"
 #include "ash/wm/workspace/workspace_layout_manager.h"
 #include "ash/wm/workspace/workspace_manager.h"
 #include "ash/wm/workspace_controller.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "grit/ui_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/env.h"
 #include "ui/aura/layout_manager.h"
 #include "ui/aura/monitor_manager.h"
 #include "ui/aura/root_window.h"
+#include "ui/aura/shared/input_method_event_filter.h"
+#include "ui/aura/shared/root_window_event_filter.h"
 #include "ui/aura/ui_controls_aura.h"
 #include "ui/aura/window.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_animator.h"
 #include "ui/gfx/monitor.h"
 #include "ui/gfx/screen.h"
 #include "ui/gfx/size.h"
 #include "ui/ui_controls/ui_controls.h"
 #include "ui/views/widget/native_widget_aura.h"
 #include "ui/views/widget/widget.h"
@@ skipping 427 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // Shell::TestApi
 
 Shell::TestApi::TestApi(Shell* shell) : shell_(shell) {}
 
 internal::RootWindowLayoutManager* Shell::TestApi::root_window_layout() {
   return shell_->root_window_layout_;
 }
 
-internal::InputMethodEventFilter* Shell::TestApi::input_method_event_filter() {
+aura::shared::InputMethodEventFilter*
+Shell::TestApi::input_method_event_filter() {

[Ben Goodger (Google), 2012/05/15 17:35:13]

nit indent 4 spaces

   return shell_->input_method_filter_.get();
 }
 
 internal::SystemGestureEventFilter*
     Shell::TestApi::system_gesture_event_filter() {
   return shell_->system_gesture_filter_.get();
 }
 
 internal::WorkspaceController* Shell::TestApi::workspace_controller() {
   return shell_->workspace_controller_.get();
@@ skipping 104 matching lines @@
   instance_ = NULL;
 }
 
 // static
 aura::RootWindow* Shell::GetRootWindow() {
   return GetInstance()->root_window_.get();
 }
 
 void Shell::Init() {
   aura::RootWindow* root_window = GetRootWindow();
-  root_filter_ = new internal::RootWindowEventFilter(root_window);
+  root_filter_ = new aura::shared::RootWindowEventFilter(root_window);
 #if !defined(OS_MACOSX)
   nested_dispatcher_controller_.reset(new NestedDispatcherController);
   accelerator_controller_.reset(new AcceleratorController);
 #endif
   shell_context_menu_.reset(new internal::ShellContextMenu);
   // Pass ownership of the filter to the root window.
   GetRootWindow()->SetEventFilter(root_filter_);
 
   // KeyRewriterEventFilter must be the first one.
   DCHECK(!GetRootWindowEventFilterCount());
   key_rewriter_filter_.reset(new internal::KeyRewriterEventFilter);
   AddRootWindowEventFilter(key_rewriter_filter_.get());
 
   // PartialScreenshotEventFilter must be the second one to capture key
   // events when the taking partial screenshot UI is there.
   DCHECK_EQ(1U, GetRootWindowEventFilterCount());
   partial_screenshot_filter_.reset(new internal::PartialScreenshotEventFilter);
   AddRootWindowEventFilter(partial_screenshot_filter_.get());
   AddShellObserver(partial_screenshot_filter_.get());
 
   // InputMethodEventFilter must be the third one. It has to be added before
   // AcceleratorFilter.
   DCHECK_EQ(2U, GetRootWindowEventFilterCount());
-  input_method_filter_.reset(new internal::InputMethodEventFilter);
+  input_method_filter_.reset(
+      new aura::shared::InputMethodEventFilter(root_window));
   AddRootWindowEventFilter(input_method_filter_.get());
 #if !defined(OS_MACOSX)
   accelerator_filter_.reset(new internal::AcceleratorFilter);
   AddRootWindowEventFilter(accelerator_filter_.get());
 #endif
 
   system_gesture_filter_.reset(new internal::SystemGestureEventFilter);
   AddRootWindowEventFilter(system_gesture_filter_.get());
 
   root_window->SetCursor(ui::kCursorPointer);
@@ skipping 69 matching lines @@
 aura::Window* Shell::GetContainer(int container_id) {
   return const_cast<aura::Window*>(
       const_cast<const Shell*>(this)->GetContainer(container_id));
 }
 
 const aura::Window* Shell::GetContainer(int container_id) const {
   return GetRootWindow()->GetChildById(container_id);
 }
 
 void Shell::AddRootWindowEventFilter(aura::EventFilter* filter) {
-  static_cast<internal::RootWindowEventFilter*>(
+  static_cast<aura::shared::RootWindowEventFilter*>(
       GetRootWindow()->event_filter())->AddFilter(filter);
 }
 
 void Shell::RemoveRootWindowEventFilter(aura::EventFilter* filter) {
-  static_cast<internal::RootWindowEventFilter*>(
+  static_cast<aura::shared::RootWindowEventFilter*>(
       GetRootWindow()->event_filter())->RemoveFilter(filter);
 }
 
 size_t Shell::GetRootWindowEventFilterCount() const {
-  return static_cast<internal::RootWindowEventFilter*>(
+  return static_cast<aura::shared::RootWindowEventFilter*>(
       GetRootWindow()->event_filter())->GetFilterCount();
 }
 
 void Shell::ShowBackgroundMenu(views::Widget* widget,
                                const gfx::Point& location) {
   if (shell_context_menu_.get())
     shell_context_menu_->ShowMenu(widget, location);
 }
 
 void Shell::ToggleAppList() {
@@ skipping 160 matching lines @@
     panel_container->SetLayoutManager(panel_layout_manager_);
   }
 }
 
 void Shell::DisableWorkspaceGridLayout() {
   if (workspace_controller_.get())
     workspace_controller_->workspace_manager()->set_grid_size(0);
 }
 
 }  // namespace ash