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

http://crbug.com/158115
TBR=sky@chromium.org,jam@chromium.org
Review URL: https://codereview.chromium.org/11275139

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167236 0039d316-1c4b-4281-b951-d872f2087c98

11 files changed, 34 insertions, 31 deletions

diff --git a/ash/magnifier/magnification_controller.cc b/ash/magnifier/magnification_controller.cc
index cd89c1f..d014cd4 100644
--- a/ash/magnifier/magnification_controller.cc
+++ b/ash/magnifier/magnification_controller.cc
@@ -9,7 +9,6 @@
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ui/aura/client/cursor_client.h"
 #include "ui/aura/root_window.h"
-#include "ui/aura/shared/compound_event_filter.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_property.h"
 #include "ui/base/events/event.h"
@@ -19,6 +18,7 @@
 #include "ui/compositor/layer_animation_observer.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/screen.h"
+#include "ui/views/corewm/compound_event_filter.h"
 
 namespace {
 
diff --git a/ash/root_window_controller.h b/ash/root_window_controller.h
index 4d9cc8d..b34124e 100644
--- a/ash/root_window_controller.h
+++ b/ash/root_window_controller.h
@@ -13,19 +13,22 @@
 
 class SkBitmap;
 
-namespace gfx {
-class Point;
-}
-
 namespace aura {
 class EventFilter;
 class RootWindow;
 class Window;
-namespace shared {
+}
+
+namespace gfx {
+class Point;
+}
+
+namespace views {
+namespace corewm {
 class InputMethodEventFilter;
 class RootWindowEventFilter;
-}  // namespace shared
-}  // namespace aura
+}
+}
 
 namespace ash {
 class Launcher;
diff --git a/ash/shell.cc b/ash/shell.cc
index 5fd3306..579bd76 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -72,8 +72,6 @@
 #include "ui/aura/focus_manager.h"
 #include "ui/aura/layout_manager.h"
 #include "ui/aura/root_window.h"
-#include "ui/aura/shared/compound_event_filter.h"
-#include "ui/aura/shared/input_method_event_filter.h"
 #include "ui/aura/ui_controls_aura.h"
 #include "ui/aura/window.h"
 #include "ui/compositor/layer.h"
@@ -83,6 +81,8 @@
 #include "ui/gfx/screen.h"
 #include "ui/gfx/size.h"
 #include "ui/ui_controls/ui_controls.h"
+#include "ui/views/corewm/compound_event_filter.h"
+#include "ui/views/corewm/input_method_event_filter.h"
 #include "ui/views/focus/focus_manager_factory.h"
 #include "ui/views/widget/native_widget_aura.h"
 #include "ui/views/widget/widget.h"
@@ -165,7 +165,7 @@ internal::RootWindowLayoutManager* Shell::TestApi::root_window_layout() {
   return shell_->GetPrimaryRootWindowController()->root_window_layout();
 }
 
-aura::shared::InputMethodEventFilter*
+views::corewm::InputMethodEventFilter*
     Shell::TestApi::input_method_event_filter() {
   return shell_->input_method_filter_.get();
 }
@@ -388,7 +388,7 @@ void Shell::Init() {
   // Launcher, and WallPaper could be created by the factory.
   views::FocusManagerFactory::Install(new AshFocusManagerFactory);
 
-  env_filter_.reset(new aura::shared::CompoundEventFilter);
+  env_filter_.reset(new views::corewm::CompoundEventFilter);
   AddEnvEventFilter(env_filter_.get());
 
   focus_manager_.reset(new aura::FocusManager);
@@ -422,7 +422,7 @@ void Shell::Init() {
   AddEnvEventFilter(overlay_filter_.get());
   AddShellObserver(overlay_filter_.get());
 
-  input_method_filter_.reset(new aura::shared::InputMethodEventFilter());
+  input_method_filter_.reset(new views::corewm::InputMethodEventFilter);
   AddEnvEventFilter(input_method_filter_.get());
 
 #if !defined(OS_MACOSX)
diff --git a/ash/shell.h b/ash/shell.h
index 41ce0dd2..d25998e 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -33,10 +33,6 @@ class Window;
 namespace client {
 class UserActionClient;
 }
-namespace shared {
-class CompoundEventFilter;
-class InputMethodEventFilter;
-}
 }
 namespace chromeos {
 class OutputConfigurator;
@@ -56,6 +52,10 @@ class Layer;
 namespace views {
 class NonClientFrameView;
 class Widget;
+namespace corewm {
+class CompoundEventFilter;
+class InputMethodEventFilter;
+}
 }
 
 namespace ash {
@@ -132,7 +132,7 @@ class ASH_EXPORT Shell : internal::SystemModalContainerEventFilterDelegate,
     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();
@@ -267,7 +267,7 @@ class ASH_EXPORT Shell : internal::SystemModalContainerEventFilterDelegate,
   }
 #endif  // !defined(OS_MACOSX)
 
-  aura::shared::CompoundEventFilter* env_filter() {
+  views::corewm::CompoundEventFilter* env_filter() {
     return env_filter_.get();
   }
   internal::TooltipController* tooltip_controller() {
@@ -451,7 +451,7 @@ class ASH_EXPORT Shell : internal::SystemModalContainerEventFilterDelegate,
   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_;
 
@@ -510,7 +510,7 @@ class ASH_EXPORT Shell : internal::SystemModalContainerEventFilterDelegate,
 #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.
diff --git a/ash/wm/power_button_controller.cc b/ash/wm/power_button_controller.cc
index 8195200..21432ed 100644
--- a/ash/wm/power_button_controller.cc
+++ b/ash/wm/power_button_controller.cc
@@ -12,7 +12,7 @@
 #include "ash/wm/session_state_controller.h"
 #include "base/command_line.h"
 #include "ui/aura/root_window.h"
-#include "ui/aura/shared/compound_event_filter.h"
+#include "ui/views/corewm/compound_event_filter.h"
 
 namespace ash {
 
diff --git a/ash/wm/session_state_controller.cc b/ash/wm/session_state_controller.cc
index 9af6486..6de1351 100644
--- a/ash/wm/session_state_controller.cc
+++ b/ash/wm/session_state_controller.cc
@@ -11,7 +11,7 @@
 #include "ash/wm/session_state_animator.h"
 #include "base/command_line.h"
 #include "ui/aura/root_window.h"
-#include "ui/aura/shared/compound_event_filter.h"
+#include "ui/views/corewm/compound_event_filter.h"
 
 #if defined(OS_CHROMEOS)
 #include "base/chromeos/chromeos_version.h"
diff --git a/ash/wm/session_state_controller_impl.cc b/ash/wm/session_state_controller_impl.cc
index 04439f7..18e041d 100644
--- a/ash/wm/session_state_controller_impl.cc
+++ b/ash/wm/session_state_controller_impl.cc
@@ -11,7 +11,7 @@
 #include "ash/wm/session_state_animator.h"
 #include "base/command_line.h"
 #include "ui/aura/root_window.h"
-#include "ui/aura/shared/compound_event_filter.h"
+#include "ui/views/corewm/compound_event_filter.h"
 
 #if defined(OS_CHROMEOS)
 #include "base/chromeos/chromeos_version.h"
diff --git a/ash/wm/session_state_controller_impl2.cc b/ash/wm/session_state_controller_impl2.cc
index 201f279..ebbc3f3 100644
--- a/ash/wm/session_state_controller_impl2.cc
+++ b/ash/wm/session_state_controller_impl2.cc
@@ -12,7 +12,7 @@
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "ui/aura/root_window.h"
-#include "ui/aura/shared/compound_event_filter.h"
+#include "ui/views/corewm/compound_event_filter.h"
 
 #if defined(OS_CHROMEOS)
 #include "base/chromeos/chromeos_version.h"
diff --git a/ash/wm/system_modal_container_layout_manager.cc b/ash/wm/system_modal_container_layout_manager.cc
index 2087b1f..e6976ab 100644
--- a/ash/wm/system_modal_container_layout_manager.cc
+++ b/ash/wm/system_modal_container_layout_manager.cc
@@ -16,7 +16,7 @@
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/capture_client.h"
 #include "ui/aura/root_window.h"
-#include "ui/aura/shared/compound_event_filter.h"
+#include "ui/views/corewm/compound_event_filter.h"
 #include "ui/aura/window.h"
 #include "ui/base/events/event.h"
 #include "ui/compositor/layer.h"
diff --git a/ash/wm/window_manager_unittest.cc b/ash/wm/window_manager_unittest.cc
index e0992dd..cab64d8 100644
--- a/ash/wm/window_manager_unittest.cc
+++ b/ash/wm/window_manager_unittest.cc
@@ -14,8 +14,6 @@
 #include "ui/aura/env.h"
 #include "ui/aura/focus_manager.h"
 #include "ui/aura/root_window.h"
-#include "ui/aura/shared/compound_event_filter.h"
-#include "ui/aura/shared/input_method_event_filter.h"
 #include "ui/aura/test/aura_test_base.h"
 #include "ui/aura/test/event_generator.h"
 #include "ui/aura/test/test_event_filter.h"
@@ -25,6 +23,8 @@
 #include "ui/base/events/event.h"
 #include "ui/base/hit_test.h"
 #include "ui/gfx/screen.h"
+#include "ui/views/corewm/compound_event_filter.h"
+#include "ui/views/corewm/input_method_event_filter.h"
 
 namespace {
 
@@ -525,7 +525,7 @@ TEST_F(WindowManagerTest, AdditionalFilters) {
   scoped_ptr<aura::test::TestEventFilter> f2(new aura::test::TestEventFilter);
 
   // Adds them to root window event filter.
-  aura::shared::CompoundEventFilter* env_filter =
+  views::corewm::CompoundEventFilter* env_filter =
       Shell::GetInstance()->env_filter();
   env_filter->AddFilter(f1.get());
   env_filter->AddFilter(f2.get());
diff --git a/ash/wm/workspace/multi_window_resize_controller.cc b/ash/wm/workspace/multi_window_resize_controller.cc
index 3a330aa..490f1ac 100644
--- a/ash/wm/workspace/multi_window_resize_controller.cc
+++ b/ash/wm/workspace/multi_window_resize_controller.cc
@@ -15,7 +15,6 @@
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/event_filter.h"
 #include "ui/aura/root_window.h"
-#include "ui/aura/shared/compound_event_filter.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/base/hit_test.h"
@@ -23,6 +22,7 @@
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/screen.h"
+#include "ui/views/corewm/compound_event_filter.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
@@ -101,7 +101,7 @@ class MultiWindowResizeController::ResizeView : public views::View {
   virtual gfx::NativeCursor GetCursor(
       const ui::MouseEvent& event) OVERRIDE {
     int component = (direction_ == LEFT_RIGHT) ? HTRIGHT : HTBOTTOM;
-    return aura::shared::CompoundEventFilter::CursorForWindowComponent(
+    return views::corewm::CompoundEventFilter::CursorForWindowComponent(
         component);
   }