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

Unified Diff: ash/wm/aura/wm_root_window_controller_aura.cc

Issue 1943603002: Makes ash/wm/common a library (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge again Created 4 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/wm/aura/wm_lookup_aura.cc ('k') | ash/wm/aura/wm_shelf_aura.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/aura/wm_root_window_controller_aura.cc
diff --git a/ash/wm/aura/wm_root_window_controller_aura.cc b/ash/wm/aura/wm_root_window_controller_aura.cc
index 976a3359954c13bae5f99d33ec5f047508129bf0..5297eeb62e66e479eb243c999333f4c91aac8214 100644
--- a/ash/wm/aura/wm_root_window_controller_aura.cc
+++ b/ash/wm/aura/wm_root_window_controller_aura.cc
@@ -29,13 +29,6 @@ DEFINE_OWNED_WINDOW_PROPERTY_KEY(ash::wm::WmRootWindowControllerAura,
kWmRootWindowControllerKey,
nullptr);
-// static
-WmRootWindowController* WmRootWindowController::GetWithDisplayId(int64_t id) {
- return WmRootWindowControllerAura::Get(Shell::GetInstance()
- ->window_tree_host_manager()
- ->GetRootWindowForDisplayId(id));
-}
-
WmRootWindowControllerAura::WmRootWindowControllerAura(
RootWindowController* root_window_controller)
: root_window_controller_(root_window_controller) {
@@ -74,7 +67,7 @@ bool WmRootWindowControllerAura::HasShelf() {
}
WmGlobals* WmRootWindowControllerAura::GetGlobals() {
- return WmGlobalsAura::Get();
+ return WmGlobals::Get();
}
WorkspaceWindowState WmRootWindowControllerAura::GetWorkspaceWindowState() {
« no previous file with comments | « ash/wm/aura/wm_lookup_aura.cc ('k') | ash/wm/aura/wm_shelf_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698