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

Unified Diff: ash/common/wallpaper/wallpaper_controller.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/test/test_shelf_delegate.cc ('k') | ash/common/wm/dock/docked_window_layout_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/wallpaper/wallpaper_controller.cc
diff --git a/ash/common/wallpaper/wallpaper_controller.cc b/ash/common/wallpaper/wallpaper_controller.cc
index 42e70a74423a8e63d2deda24241c925656ca9b3f..8c1420afdf54986f6586160148d7bf087aaa2ec2 100644
--- a/ash/common/wallpaper/wallpaper_controller.cc
+++ b/ash/common/wallpaper/wallpaper_controller.cc
@@ -16,6 +16,7 @@
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/root_window_controller.h"
+#include "ash/shell.h"
#include "base/bind.h"
#include "base/command_line.h"
#include "base/logging.h"
@@ -74,7 +75,7 @@ WallpaperController::WallpaperController(
wallpaper_reload_delay_(kWallpaperReloadDelayMs),
task_runner_(task_runner) {
WmShell::Get()->AddDisplayObserver(this);
- WmShell::Get()->AddShellObserver(this);
+ Shell::GetInstance()->AddShellObserver(this);
}
WallpaperController::~WallpaperController() {
@@ -83,7 +84,7 @@ WallpaperController::~WallpaperController() {
if (color_calculator_)
color_calculator_->RemoveObserver(this);
WmShell::Get()->RemoveDisplayObserver(this);
- WmShell::Get()->RemoveShellObserver(this);
+ Shell::GetInstance()->RemoveShellObserver(this);
}
void WallpaperController::BindRequest(
« no previous file with comments | « ash/common/test/test_shelf_delegate.cc ('k') | ash/common/wm/dock/docked_window_layout_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698