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

Unified Diff: ash/common/test/test_shelf_delegate.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
Index: ash/common/test/test_shelf_delegate.cc
diff --git a/ash/common/test/test_shelf_delegate.cc b/ash/common/test/test_shelf_delegate.cc
index ee762fdc6958a4aa826c6777e5879ec7c8e4edc7..7a6df080c4fcd3fefa424a3fb8326b746672ef76 100644
--- a/ash/common/test/test_shelf_delegate.cc
+++ b/ash/common/test/test_shelf_delegate.cc
@@ -13,6 +13,7 @@
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/root_window_controller.h"
+#include "ash/shell.h"
#include "ash/wm/window_properties.h"
#include "base/memory/ptr_util.h"
#include "ui/aura/window.h"
@@ -26,8 +27,10 @@ TestShelfDelegate* TestShelfDelegate::instance_ = nullptr;
// shelf is created, to simulate ChromeLauncherController's behavior.
class ShelfInitializer : public ShellObserver {
public:
- ShelfInitializer() { WmShell::Get()->AddShellObserver(this); }
- ~ShelfInitializer() override { WmShell::Get()->RemoveShellObserver(this); }
+ ShelfInitializer() { Shell::GetInstance()->AddShellObserver(this); }
+ ~ShelfInitializer() override {
+ Shell::GetInstance()->RemoveShellObserver(this);
+ }
// ShellObserver:
void OnShelfCreatedForRootWindow(WmWindow* root_window) override {
« no previous file with comments | « ash/common/system/web_notification/ash_popup_alignment_delegate.cc ('k') | ash/common/wallpaper/wallpaper_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698