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

Unified Diff: ash/common/wm_window.h

Issue 2620153003: Folds WmRootWindowController into RootWindowController (Closed)
Patch Set: merge Created 3 years, 11 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/common/wm_shell.cc ('k') | ash/mus/accelerators/accelerator_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/wm_window.h
diff --git a/ash/common/wm_window.h b/ash/common/wm_window.h
index 927863bbb22388ccfaf18882fa6b921ac6060fce..d94862555fd1ce330c93a6edf38c1401939a0642 100644
--- a/ash/common/wm_window.h
+++ b/ash/common/wm_window.h
@@ -42,8 +42,8 @@ class Widget;
namespace ash {
class ImmersiveFullscreenController;
+class RootWindowController;
class WmLayoutManager;
-class WmRootWindowController;
class WmShell;
class WmTransientWindowObserver;
class WmWindowObserver;
@@ -72,7 +72,7 @@ class ASH_EXPORT WmWindow {
const_cast<const WmWindow*>(this)->GetRootWindow());
}
virtual const WmWindow* GetRootWindow() const = 0;
- virtual WmRootWindowController* GetRootWindowController() = 0;
+ virtual RootWindowController* GetRootWindowController() = 0;
// TODO(sky): fix constness.
virtual WmShell* GetShell() const = 0;
« no previous file with comments | « ash/common/wm_shell.cc ('k') | ash/mus/accelerators/accelerator_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698