commit e319c7ec34024b7c06ee300303b6927063f255f7
author ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Fri Mar 14 19:56:14 2014
committer ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Fri Mar 14 19:56:14 2014
tree 1778920d6f5299c325df18b8c278f6618db172a6
parent 0706341097163814a7bacf89aec118ebfd5ba69c

Move wm/core to wm namespace.

Also sets up new targets for wm_core, wm_core_unittests, etc.

R=sky@chromium.org
TBR=sky@chromium.org
BUG=

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=256680

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=256839

Review URL: https://codereview.chromium.org/196063002

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

ash/root_window_controller.h

diff --git a/ash/root_window_controller.h b/ash/root_window_controller.h
index d347d812..ddf63555 100644
--- a/ash/root_window_controller.h
+++ b/ash/root_window_controller.h
@@ -28,16 +28,6 @@
 class Point;
 }
 
-namespace views {
-class Widget;
-
-namespace corewm {
-class InputMethodEventFilter;
-class RootWindowEventFilter;
-class ScopedCaptureClient;
-}
-}
-
 namespace keyboard {
 class KeyboardController;
 }
@@ -46,6 +36,16 @@
 class EventHandler;
 }
 
+namespace views {
+class Widget;
+}
+
+namespace wm {
+class InputMethodEventFilter;
+class RootWindowEventFilter;
+class ScopedCaptureClient;
+}
+
 namespace ash {
 class ShelfWidget;
 class StackingController;
@@ -307,7 +307,7 @@
 
   scoped_ptr<DesktopBackgroundWidgetController> wallpaper_controller_;
   scoped_ptr<AnimatingDesktopController> animating_wallpaper_controller_;
-  scoped_ptr<views::corewm::ScopedCaptureClient> capture_client_;
+  scoped_ptr< ::wm::ScopedCaptureClient> capture_client_;
 
   DISALLOW_COPY_AND_ASSIGN(RootWindowController);
 };