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

Unified Diff: ash/root_window_controller.h

Issue 2919533002: [mus+ash] removes WmWindow, wm_window.h and wm_window.cc (Closed)
Patch Set: [mus+ash] removes WmWindow, wm_window.h and wm_window.cc (fixes build) Created 3 years, 7 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/mus/bridge/shell_port_mash.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 904d66899940ef7b69db83a1daa10d9cee24fbe3..f97dce28d1bb20d25cb7955e8563fdc64a61cea0 100644
--- a/ash/root_window_controller.h
+++ b/ash/root_window_controller.h
@@ -63,7 +63,6 @@ class SystemWallpaperController;
class TouchHudDebug;
class TouchHudProjection;
class WallpaperWidgetController;
-class WmWindow;
class WorkspaceController;
namespace mus {
@@ -125,13 +124,6 @@ class ASH_EXPORT RootWindowController : public ShellObserver {
aura::Window* GetRootWindow();
const aura::Window* GetRootWindow() const;
- // TODO(sky): remove these. http://crbug.com/671246.
- WmWindow* GetWindow() {
- return const_cast<WmWindow*>(
- const_cast<const RootWindowController*>(this)->GetWindow());
- }
- const WmWindow* GetWindow() const;
-
WorkspaceController* workspace_controller() {
return workspace_controller_.get();
}
@@ -207,14 +199,6 @@ class ASH_EXPORT RootWindowController : public ShellObserver {
aura::Window* GetContainer(int container_id);
const aura::Window* GetContainer(int container_id) const;
- // TODO(sky): remove these. http://crbug.com/671246.
- WmWindow* GetWmContainer(int container_id) {
- return const_cast<WmWindow*>(
- const_cast<const RootWindowController*>(this)->GetWmContainer(
- container_id));
- }
- const WmWindow* GetWmContainer(int container_id) const;
-
WallpaperWidgetController* wallpaper_widget_controller() {
return wallpaper_widget_controller_.get();
}
« no previous file with comments | « ash/mus/bridge/shell_port_mash.cc ('k') | ash/root_window_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698