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

Unified Diff: ash/root_window_controller.cc

Issue 1841803002: Cleanup WorkspaceController and WorkspaceLayoutManager. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Check if the container is kShellWindowId_DefaultContainer instead. Created 4 years, 8 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 | « no previous file | ash/shelf/shelf_widget.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 837550605183be4a0337a37e1cd11a70ff1752d7..335ae25068d5afe9cc8ad2fe71b1b765bdb2336d 100644
--- a/ash/root_window_controller.cc
+++ b/ash/root_window_controller.cc
@@ -541,7 +541,7 @@ void RootWindowController::CloseChildWindows() {
void RootWindowController::MoveWindowsTo(aura::Window* dst) {
// Forget the shelf early so that shelf don't update itself using wrong
// display info.
- workspace_controller_->SetShelf(NULL);
+ workspace_controller_->set_shelf(nullptr);
ReparentAllWindows(GetRootWindow(), dst);
}
« no previous file with comments | « no previous file | ash/shelf/shelf_widget.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698