Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1897)

Unified Diff: ash/root_window_controller.h

Issue 196063002: Move wm/core to wm namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/popup_message.cc ('k') | ash/root_window_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/root_window_controller.h
diff --git a/ash/root_window_controller.h b/ash/root_window_controller.h
index d347d8126be340145df86a1e55de349a1ed9e289..ddf63555eec1d9a0f134320389c39d83acad223e 100644
--- a/ash/root_window_controller.h
+++ b/ash/root_window_controller.h
@@ -28,16 +28,6 @@ namespace gfx {
class Point;
}
-namespace views {
-class Widget;
-
-namespace corewm {
-class InputMethodEventFilter;
-class RootWindowEventFilter;
-class ScopedCaptureClient;
-}
-}
-
namespace keyboard {
class KeyboardController;
}
@@ -46,6 +36,16 @@ namespace ui {
class EventHandler;
}
+namespace views {
+class Widget;
+}
+
+namespace wm {
+class InputMethodEventFilter;
+class RootWindowEventFilter;
+class ScopedCaptureClient;
+}
+
namespace ash {
class ShelfWidget;
class StackingController;
@@ -307,7 +307,7 @@ class ASH_EXPORT RootWindowController : public ShellObserver {
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);
};
« no previous file with comments | « ash/popup_message.cc ('k') | ash/root_window_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698