Revert "Move wm/core to wm namespace."

This reverts commit 521c703f8d62fa698c3e88287c64d8d23f9ac675.

Broke gyp

BUG=

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

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

1 files changed, 11 insertions, 11 deletions

diff --git a/ash/root_window_controller.h b/ash/root_window_controller.h
index ddf6355..d347d81 100644
--- a/ash/root_window_controller.h
+++ b/ash/root_window_controller.h
@@ -28,23 +28,23 @@ namespace gfx {
 class Point;
 }
 
-namespace keyboard {
-class KeyboardController;
-}
-
-namespace ui {
-class EventHandler;
-}
-
 namespace views {
 class Widget;
-}
 
-namespace wm {
+namespace corewm {
 class InputMethodEventFilter;
 class RootWindowEventFilter;
 class ScopedCaptureClient;
 }
+}
+
+namespace keyboard {
+class KeyboardController;
+}
+
+namespace ui {
+class EventHandler;
+}
 
 namespace ash {
 class ShelfWidget;
@@ -307,7 +307,7 @@ class ASH_EXPORT RootWindowController : public ShellObserver {
 
   scoped_ptr<DesktopBackgroundWidgetController> wallpaper_controller_;
   scoped_ptr<AnimatingDesktopController> animating_wallpaper_controller_;
-  scoped_ptr< ::wm::ScopedCaptureClient> capture_client_;
+  scoped_ptr<views::corewm::ScopedCaptureClient> capture_client_;
 
   DISALLOW_COPY_AND_ASSIGN(RootWindowController);
 };