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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/common/wm/panels/panel_layout_manager.cc

Issue 2739763003: Moves maintaining ShellObservers back to Shell (Closed)
Patch Set: 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
« ash/accelerators/accelerator_interactive_uitest_chromeos.cc ('K') | « ash/common/wm/panels/panel_frame_view.cc ('k') | ash/common/wm/screen_dimmer.cc » ('j') | ash/high_contrast/high_contrast_controller.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/wm/panels/panel_layout_manager.cc
diff --git a/ash/common/wm/panels/panel_layout_manager.cc b/ash/common/wm/panels/panel_layout_manager.cc
index b78f31ffdb1c52e6459254765a06ca332d8c2b74..66ddd3cee80cc76ce0dcf02dc5af21f1b07b47f7 100644
--- a/ash/common/wm/panels/panel_layout_manager.cc
+++ b/ash/common/wm/panels/panel_layout_manager.cc
@@ -253,7 +253,7 @@ PanelLayoutManager::PanelLayoutManager(WmWindow* panel_container)
WmShell* shell = panel_container->GetShell();
Shell::GetInstance()->activation_client()->AddObserver(this);
shell->AddDisplayObserver(this);
- shell->AddShellObserver(this);
+ Shell::GetInstance()->AddShellObserver(this);
}
PanelLayoutManager::~PanelLayoutManager() {
@@ -284,7 +284,7 @@ void PanelLayoutManager::Shutdown() {
WmShell* shell = panel_container_->GetShell();
Shell::GetInstance()->activation_client()->RemoveObserver(this);
shell->RemoveDisplayObserver(this);
- shell->RemoveShellObserver(this);
+ Shell::GetInstance()->RemoveShellObserver(this);
}
void PanelLayoutManager::StartDragging(WmWindow* panel) {
« ash/accelerators/accelerator_interactive_uitest_chromeos.cc ('K') | « ash/common/wm/panels/panel_frame_view.cc ('k') | ash/common/wm/screen_dimmer.cc » ('j') | ash/high_contrast/high_contrast_controller.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698