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

Unified Diff: ash/common/wm/dock/docked_window_layout_manager.cc

Issue 2739763003: Moves maintaining ShellObservers back to Shell (Closed)
Patch Set: merge 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/common/wallpaper/wallpaper_controller.cc ('k') | ash/common/wm/lock_layout_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/wm/dock/docked_window_layout_manager.cc
diff --git a/ash/common/wm/dock/docked_window_layout_manager.cc b/ash/common/wm/dock/docked_window_layout_manager.cc
index c7519f95c5140c4a0fa5e50bedfdb5a8bbeefff8..ef6478be372ffa61a4481fd2119ccc5e0867e35c 100644
--- a/ash/common/wm/dock/docked_window_layout_manager.cc
+++ b/ash/common/wm/dock/docked_window_layout_manager.cc
@@ -382,7 +382,7 @@ DockedWindowLayoutManager::DockedWindowLayoutManager(WmWindow* dock_container)
last_action_time_(base::Time::Now()),
background_widget_(nullptr) {
DCHECK(dock_container);
- dock_container_->GetShell()->AddShellObserver(this);
+ Shell::GetInstance()->AddShellObserver(this);
Shell::GetInstance()->activation_client()->AddObserver(this);
display::Screen::GetScreen()->AddObserver(this);
}
@@ -411,7 +411,7 @@ void DockedWindowLayoutManager::Shutdown() {
child->GetWindowState()->RemoveObserver(this);
}
Shell::GetInstance()->activation_client()->RemoveObserver(this);
- dock_container_->GetShell()->RemoveShellObserver(this);
+ Shell::GetInstance()->RemoveShellObserver(this);
display::Screen::GetScreen()->RemoveObserver(this);
}
« no previous file with comments | « ash/common/wallpaper/wallpaper_controller.cc ('k') | ash/common/wm/lock_layout_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698