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

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

Issue 2808723004: Renames WmShell to ShellPort (Closed)
Patch Set: feedback Created 3 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
Index: ash/wm/panels/panel_layout_manager.cc
diff --git a/ash/wm/panels/panel_layout_manager.cc b/ash/wm/panels/panel_layout_manager.cc
index e05eb6e56b4795b5ed14b1d4ca88376ac92ac213..c3d9cd133a5d4cbc978115c215452e82e02d08eb 100644
--- a/ash/wm/panels/panel_layout_manager.cc
+++ b/ash/wm/panels/panel_layout_manager.cc
@@ -15,6 +15,7 @@
#include "ash/shelf/wm_shelf.h"
#include "ash/shelf/wm_shelf_util.h"
#include "ash/shell.h"
+#include "ash/shell_port.h"
#include "ash/wm/overview/window_selector_controller.h"
#include "ash/wm/window_animation_types.h"
#include "ash/wm/window_parenting_utils.h"
@@ -22,7 +23,6 @@
#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
#include "ash/wm/window_util.h"
-#include "ash/wm_shell.h"
#include "ash/wm_window.h"
#include "base/auto_reset.h"
#include "third_party/skia/include/core/SkColor.h"
@@ -259,7 +259,7 @@ PanelLayoutManager::PanelLayoutManager(WmWindow* panel_container)
weak_factory_(this) {
DCHECK(panel_container);
Shell::Get()->activation_client()->AddObserver(this);
- WmShell::Get()->AddDisplayObserver(this);
+ ShellPort::Get()->AddDisplayObserver(this);
Shell::Get()->AddShellObserver(this);
}
@@ -289,9 +289,8 @@ void PanelLayoutManager::Shutdown() {
delete iter->callout_widget;
}
panel_windows_.clear();
- WmShell* shell = panel_container_->GetShell();
Shell::Get()->activation_client()->RemoveObserver(this);
- shell->RemoveDisplayObserver(this);
+ ShellPort::Get()->RemoveDisplayObserver(this);
Shell::Get()->RemoveShellObserver(this);
}

Powered by Google App Engine
This is Rietveld 408576698