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

Unified Diff: mash/wm/root_window_controller.cc

Issue 1755223002: Adds WindowManagerManager to mus (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge and WindowManagerState Created 4 years, 10 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 | « mash/wm/root_window_controller.h ('k') | mash/wm/window_manager_application.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mash/wm/root_window_controller.cc
diff --git a/mash/wm/root_window_controller.cc b/mash/wm/root_window_controller.cc
index a554310a147ba5dd7720eea2a3f52a6cb4e0537a..34ac1a9ec77ab31befb752199ffc61ce3702cd84 100644
--- a/mash/wm/root_window_controller.cc
+++ b/mash/wm/root_window_controller.cc
@@ -36,16 +36,6 @@ void AssertTrue(bool success) {
} // namespace
// static
-RootWindowController* RootWindowController::CreateUsingWindowTreeHost(
- WindowManagerApplication* app) {
- RootWindowController* controller = new RootWindowController(app);
- mus::CreateWindowTreeHost(app->connector(), controller,
- &controller->window_tree_host_,
- controller->window_manager_.get());
- return controller;
-}
-
-// static
RootWindowController* RootWindowController::CreateFromDisplay(
WindowManagerApplication* app,
mus::mojom::DisplayPtr display,
@@ -140,7 +130,6 @@ void RootWindowController::OnEmbed(mus::Window* root) {
mus::Window* window = GetWindowForContainer(mojom::Container::USER_WINDOWS);
layout_manager_[window].reset(new WindowLayout(window));
window_manager_client()->AddActivationParent(window);
- window_tree_host_->SetTitle("Mash");
AddAccelerators();
« no previous file with comments | « mash/wm/root_window_controller.h ('k') | mash/wm/window_manager_application.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698