Move ui\aura\shared to ui\views\corewm

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_
 
 #include <utility>
 #include <vector>
 
@@ skipping 15 matching lines @@
 class CommandLine;
 
 namespace aura {
 class EventFilter;
 class FocusManager;
 class RootWindow;
 class Window;
 namespace client {
 class UserActionClient;
 }
-namespace shared {
-class CompoundEventFilter;
-class InputMethodEventFilter;
-}
 }
 namespace chromeos {
 class OutputConfigurator;
 }
 namespace content {
 class BrowserContext;
 }
 
 namespace gfx {
 class ImageSkia;
 class Point;
 class Rect;
 }
 namespace ui {
 class Layer;
 }
 namespace views {
 class NonClientFrameView;
 class Widget;
+namespace corewm {
+class CompoundEventFilter;
+class InputMethodEventFilter;
+}
 }
 
 namespace ash {
 
 class AcceleratorController;
 class CapsLockDelegate;
 class DesktopBackgroundController;
 class DisplayController;
 class HighContrastController;
 class Launcher;
@@ skipping 56 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();
-    aura::shared::InputMethodEventFilter* input_method_event_filter();
+    views::corewm::InputMethodEventFilter* input_method_event_filter();
     internal::SystemGestureEventFilter* system_gesture_event_filter();
     internal::WorkspaceController* workspace_controller();
     internal::ScreenPositionController* screen_position_controller();
 
    private:
     Shell* shell_;  // not owned
 
     DISALLOW_COPY_AND_ASSIGN(TestApi);
   };
 
@@ skipping 114 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)
 
-  aura::shared::CompoundEventFilter* env_filter() {
+  views::corewm::CompoundEventFilter* env_filter() {
     return env_filter_.get();
   }
   internal::TooltipController* tooltip_controller() {
     return tooltip_controller_.get();
   }
   internal::EventRewriterEventFilter* event_rewriter_filter() {
     return event_rewriter_filter_.get();
   }
   internal::OverlayEventFilter* overlay_filter() {
     return overlay_filter_.get();
@@ skipping 163 matching lines @@
   // If set before the Shell is initialized, the mouse cursor will be hidden
   // when the screen is initially created.
   static bool initially_hide_cursor_;
 
   ScreenAsh* screen_;
 
   // Active root window. Never becomes NULL during the session.
   aura::RootWindow* active_root_window_;
 
   // The CompoundEventFilter owned by aura::Env object.
-  scoped_ptr<aura::shared::CompoundEventFilter> env_filter_;
+  scoped_ptr<views::corewm::CompoundEventFilter> env_filter_;
 
   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 38 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<aura::shared::InputMethodEventFilter> input_method_filter_;
+  scoped_ptr<views::corewm::InputMethodEventFilter> input_method_filter_;
 
   // An event filter that silently keeps track of all touch events and controls
   // a heads-up display. This is enabled only if --ash-touch-hud flag is used.
   scoped_ptr<internal::TouchObserverHUD> touch_observer_hud_;
 
 #if defined(OS_CHROMEOS)
   // Controls video output device state.
   scoped_ptr<chromeos::OutputConfigurator> output_configurator_;
   scoped_ptr<internal::OutputConfiguratorAnimation>
       output_configurator_animation_;
 #endif  // defined(OS_CHROMEOS)
 
   CursorManager cursor_manager_;
 
   ObserverList<ShellObserver> observers_;
 
   // Used by ash/shell.
   content::BrowserContext* browser_context_;
 
   // For testing only: simulate that a modal window is open
   bool simulate_modal_window_open_for_testing_;
 
   DISALLOW_COPY_AND_ASSIGN(Shell);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELL_H_