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

Unified Diff: ash/mus/top_level_window_factory.cc

Issue 2739553005: Moves maintaining root_window_for_new_windows_ to Shell (Closed)
Patch Set: remove ash:: Created 3 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/mus/accelerators/accelerator_controller_registrar.cc ('k') | ash/root_window_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/top_level_window_factory.cc
diff --git a/ash/mus/top_level_window_factory.cc b/ash/mus/top_level_window_factory.cc
index 214ae39258b2a360d5dfc93432d8a6bc7cdee87f..d19293c978011329e63cbe7b3958816cc7cbd81f 100644
--- a/ash/mus/top_level_window_factory.cc
+++ b/ash/mus/top_level_window_factory.cc
@@ -6,7 +6,6 @@
#include "ash/common/wm/container_finder.h"
#include "ash/common/wm/window_state.h"
-#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/mus/disconnected_app_handler.h"
#include "ash/mus/frame/detached_title_area_renderer.h"
@@ -16,6 +15,7 @@
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/root_window_controller.h"
#include "ash/root_window_settings.h"
+#include "ash/shell.h"
#include "mojo/public/cpp/bindings/type_converter.h"
#include "services/ui/public/cpp/property_type_converters.h"
#include "services/ui/public/interfaces/window_manager.mojom.h"
@@ -73,7 +73,7 @@ RootWindowController* GetRootWindowControllerForNewTopLevelWindow(
}
}
return RootWindowController::ForWindow(
- WmShell::Get()->GetRootWindowForNewWindows()->aura_window());
+ Shell::GetWmRootWindowForNewWindows()->aura_window());
}
// Returns the bounds for the new window.
« no previous file with comments | « ash/mus/accelerators/accelerator_controller_registrar.cc ('k') | ash/root_window_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698