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

ash/shell.h

 // 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.
 
 #ifndef ASH_SHELL_H_
 #define ASH_SHELL_H_
 #pragma once
 
 #include <utility>
 #include <vector>
@@ skipping 10 matching lines @@
 #include "ui/gfx/insets.h"
 
 class CommandLine;
 class SkBitmap;
 
 namespace aura {
 class EventFilter;
 class Monitor;
 class RootWindow;
 class Window;
+namespace shared {
+class InputMethodEventFilter;
+class RootWindowEventFilter;
+}
 }
 namespace content {
 class BrowserContext;
 }
 
 namespace gfx {
 class Point;
 class Rect;
 }
 namespace ui {
@@ skipping 20 matching lines @@
 class VideoDetector;
 class WindowCycleController;
 
 namespace internal {
 class AcceleratorFilter;
 class ActivationController;
 class AppListController;
 class DragDropController;
 class EventClientImpl;
 class FocusCycler;
-class InputMethodEventFilter;
 class KeyRewriterEventFilter;
 class MagnificationController;
 class MonitorController;
 class PanelLayoutManager;
 class PartialScreenshotEventFilter;
 class ResizeShadowController;
-class RootWindowEventFilter;
 class RootWindowLayoutManager;
 class ScreenDimmer;
 class ShadowController;
 class ShelfLayoutManager;
 class ShellContextMenu;
 class SystemGestureEventFilter;
 class StackingController;
 class TooltipController;
 class VisibilityController;
 class WindowModalityController;
@@ skipping 11 matching lines @@
     FORWARD,
     BACKWARD
   };
 
   // Accesses private data from a Shell for testing.
   class ASH_EXPORT TestApi {
    public:
     explicit TestApi(Shell* shell);
 
     internal::RootWindowLayoutManager* root_window_layout();
-    internal::InputMethodEventFilter* input_method_event_filter();
+    aura::shared::InputMethodEventFilter* input_method_event_filter();
     internal::SystemGestureEventFilter* system_gesture_event_filter();
     internal::WorkspaceController* workspace_controller();
 
    private:
     Shell* shell_;  // not owned
 
     DISALLOW_COPY_AND_ASSIGN(TestApi);
   };
 
   // A shell must be explicitly created so that it can call |Init()| with the
@@ skipping 72 matching lines @@
   // Adds/removes observer.
   void AddShellObserver(ShellObserver* observer);
   void RemoveShellObserver(ShellObserver* observer);
 
 #if !defined(OS_MACOSX)
   AcceleratorController* accelerator_controller() {
     return accelerator_controller_.get();
   }
 #endif  // !defined(OS_MACOSX)
 
-  internal::RootWindowEventFilter* root_filter() {
+  aura::shared::RootWindowEventFilter* root_filter() {
     return root_filter_;
   }
   internal::TooltipController* tooltip_controller() {
     return tooltip_controller_.get();
   }
   internal::KeyRewriterEventFilter* key_rewriter_filter() {
     return key_rewriter_filter_.get();
   }
   internal::PartialScreenshotEventFilter* partial_screenshot_filter() {
     return partial_screenshot_filter_.get();
@@ skipping 89 matching lines @@
 
   static Shell* instance_;
 
   // If set before the Shell is initialized, the mouse cursor will be hidden
   // when the screen is initially created.
   static bool initially_hide_cursor_;
 
   scoped_ptr<aura::RootWindow> root_window_;
   ScreenAsh* screen_;
 
-  internal::RootWindowEventFilter* root_filter_;  // not owned
+  aura::shared::RootWindowEventFilter* root_filter_;  // not owned
 
   std::vector<WindowAndBoundsPair> to_restore_;
 
 #if !defined(OS_MACOSX)
   scoped_ptr<NestedDispatcherController> nested_dispatcher_controller_;
 
   scoped_ptr<AcceleratorController> accelerator_controller_;
 #endif  // !defined(OS_MACOSX)
 
   scoped_ptr<ShellDelegate> delegate_;
@@ skipping 33 matching lines @@
 
   // An event filter which handles system level gestures
   scoped_ptr<internal::SystemGestureEventFilter> system_gesture_filter_;
 
 #if !defined(OS_MACOSX)
   // An event filter that pre-handles global accelerators.
   scoped_ptr<internal::AcceleratorFilter> accelerator_filter_;
 #endif
 
   // An event filter that pre-handles all key events to send them to an IME.
-  scoped_ptr<internal::InputMethodEventFilter> input_method_filter_;
+  scoped_ptr<aura::shared::InputMethodEventFilter> input_method_filter_;
 
   // The shelf for managing the launcher and the status widget in non-compact
   // mode. Shell does not own the shelf. Instead, it is owned by container of
   // the status area.
   internal::ShelfLayoutManager* shelf_;
 
   // Manages layout of panels. Owned by PanelContainer.
   internal::PanelLayoutManager* panel_layout_manager_;
 
   ObserverList<ShellObserver> observers_;
 
   // Owned by aura::RootWindow, cached here for type safety.
   internal::RootWindowLayoutManager* root_window_layout_;
 
   // System tray with clock, Wi-Fi signal, etc.
   scoped_ptr<SystemTray> tray_;
 
   // Used by ash/shell.
   content::BrowserContext* browser_context_;
 
   DISALLOW_COPY_AND_ASSIGN(Shell);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELL_H_