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

Unified Diff: chrome/browser/chromeos/login/ui/login_display_host_impl.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: chrome/browser/chromeos/login/ui/login_display_host_impl.cc
diff --git a/chrome/browser/chromeos/login/ui/login_display_host_impl.cc b/chrome/browser/chromeos/login/ui/login_display_host_impl.cc
index 763dc932d73f517c8a6338dcfacc5e5b0cfab25d..7661afca0271e994fe3c48173f0df52fb75bd8ab 100644
--- a/chrome/browser/chromeos/login/ui/login_display_host_impl.cc
+++ b/chrome/browser/chromeos/login/ui/login_display_host_impl.cc
@@ -379,7 +379,7 @@ LoginDisplayHostImpl::LoginDisplayHostImpl(const gfx::Rect& wallpaper_bounds)
}
if (!ash_util::IsRunningInMash())
- ash::WmShell::Get()->AddShellObserver(this);
+ ash::Shell::GetInstance()->AddShellObserver(this);
else
NOTIMPLEMENTED();
display::Screen::GetScreen()->AddObserver(this);
@@ -498,7 +498,7 @@ LoginDisplayHostImpl::~LoginDisplayHostImpl() {
}
if (!ash_util::IsRunningInMash())
- ash::WmShell::Get()->RemoveShellObserver(this);
+ ash::Shell::GetInstance()->RemoveShellObserver(this);
else
NOTIMPLEMENTED();
display::Screen::GetScreen()->RemoveObserver(this);

Powered by Google App Engine
This is Rietveld 408576698