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

Unified Diff: ash/root_window_controller.cc

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/root_window_controller.h ('k') | ash/shell.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/root_window_controller.cc
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc
index 70ca0ef2383f31c0807b7242e69395f9ffe7e95c..ec3e336d5a2a5b2e8472ba953e37e7208fb434d0 100644
--- a/ash/root_window_controller.cc
+++ b/ash/root_window_controller.cc
@@ -55,7 +55,6 @@
#include "ash/wm/window_util.h"
#include "ash/wm/workspace/workspace_layout_manager.h"
#include "ash/wm/workspace_controller.h"
-#include "ash/wm_window.h"
#include "base/command_line.h"
#include "base/macros.h"
#include "base/memory/ptr_util.h"
@@ -344,10 +343,6 @@ const aura::Window* RootWindowController::GetRootWindow() const {
return GetHost()->window();
}
-const WmWindow* RootWindowController::GetWindow() const {
- return WmWindow::Get(GetRootWindow());
-}
-
wm::WorkspaceWindowState RootWindowController::GetWorkspaceWindowState() {
return workspace_controller_ ? workspace_controller()->GetWindowState()
: wm::WORKSPACE_WINDOW_STATE_DEFAULT;
@@ -482,11 +477,6 @@ const aura::Window* RootWindowController::GetContainer(int container_id) const {
return window_tree_host_->window()->GetChildById(container_id);
}
-const WmWindow* RootWindowController::GetWmContainer(int container_id) const {
- const aura::Window* window = GetContainer(container_id);
- return WmWindow::Get(window);
-}
-
void RootWindowController::SetWallpaperWidgetController(
WallpaperWidgetController* controller) {
wallpaper_widget_controller_.reset(controller);
« no previous file with comments | « ash/root_window_controller.h ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698