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

Unified Diff: ash/shelf/shelf_widget_unittest.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/root_window_controller.cc ('k') | ash/shell.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/shelf_widget_unittest.cc
diff --git a/ash/shelf/shelf_widget_unittest.cc b/ash/shelf/shelf_widget_unittest.cc
index 2e8941afa719b062ec71bc5f0d8cf8c545dc6899..de411877762d7d79b9926c0ca8e8dd19b6d1e682 100644
--- a/ash/shelf/shelf_widget_unittest.cc
+++ b/ash/shelf/shelf_widget_unittest.cc
@@ -331,9 +331,11 @@ class ShelfInitializer : public ShellObserver {
public:
ShelfInitializer(ShelfAlignment alignment, ShelfAutoHideBehavior auto_hide)
: alignment_(alignment), auto_hide_(auto_hide) {
- WmShell::Get()->AddShellObserver(this);
+ Shell::GetInstance()->AddShellObserver(this);
+ }
+ ~ShelfInitializer() override {
+ Shell::GetInstance()->RemoveShellObserver(this);
}
- ~ShelfInitializer() override { WmShell::Get()->RemoveShellObserver(this); }
// ShellObserver:
void OnShelfCreatedForRootWindow(WmWindow* root_window) override {
« no previous file with comments | « ash/root_window_controller.cc ('k') | ash/shell.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698