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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/mus/window_manager.cc

Issue 2620153003: Folds WmRootWindowController into RootWindowController (Closed)
Patch Set: merge Created 3 years, 11 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
« ash/common/wm_root_window_controller.cc ('K') | « ash/mus/bridge/wm_lookup_mus.cc ('k') | ash/root_window_controller.h » ('j') | ash/root_window_controller.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/window_manager.cc
diff --git a/ash/mus/window_manager.cc b/ash/mus/window_manager.cc
index ac91f77077a41f43abacf18cfee5e86df7ae145a..569c4691535bb68d2f781da5c5c525e3894063bc 100644
--- a/ash/mus/window_manager.cc
+++ b/ash/mus/window_manager.cc
@@ -10,7 +10,6 @@
#include "ash/common/wm/container_finder.h"
#include "ash/common/wm/window_state.h"
-#include "ash/common/wm_root_window_controller.h"
#include "ash/display/screen_position_controller.h"
#include "ash/mus/accelerators/accelerator_handler.h"
#include "ash/mus/accelerators/accelerator_ids.h"
@@ -27,6 +26,7 @@
#include "ash/mus/window_manager_observer.h"
#include "ash/mus/window_properties.h"
#include "ash/public/cpp/shell_window_ids.h"
+#include "ash/root_window_controller.h"
#include "ash/shell.h"
#include "ash/wm/ash_focus_rules.h"
#include "ash/wm/event_client_impl.h"
@@ -230,7 +230,6 @@ RootWindowController* WindowManager::CreateRootWindowController(
// TODO: this should be called when logged in. See http://crbug.com/654606.
root_window_controller->ash_root_window_controller()
- ->wm_root_window_controller()
->CreateShelf();
for (auto& observer : observers_)
« ash/common/wm_root_window_controller.cc ('K') | « ash/mus/bridge/wm_lookup_mus.cc ('k') | ash/root_window_controller.h » ('j') | ash/root_window_controller.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698