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

Unified Diff: chrome/browser/chromeos/preferences.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/preferences.cc
diff --git a/chrome/browser/chromeos/preferences.cc b/chrome/browser/chromeos/preferences.cc
index 49f21a1740cbe9082d2cc0994dad7e7c91b72805..72b1777f60d34d1254bbcd32b4791257a63c9b05 100644
--- a/chrome/browser/chromeos/preferences.cc
+++ b/chrome/browser/chromeos/preferences.cc
@@ -81,7 +81,7 @@ Preferences::Preferences()
// Do not observe shell, if there is no shell instance; e.g., in some unit
// tests.
if (ash::WmShell::HasInstance())
- ash::WmShell::Get()->AddShellObserver(this);
+ ash::Shell::GetInstance()->AddShellObserver(this);
}
Preferences::Preferences(input_method::InputMethodManager* input_method_manager)
@@ -92,7 +92,7 @@ Preferences::Preferences(input_method::InputMethodManager* input_method_manager)
// Do not observe shell, if there is no shell instance; e.g., in some unit
// tests.
if (ash::WmShell::HasInstance())
- ash::WmShell::Get()->AddShellObserver(this);
+ ash::Shell::GetInstance()->AddShellObserver(this);
}
Preferences::~Preferences() {
@@ -101,7 +101,7 @@ Preferences::~Preferences() {
// If shell instance is destoryed before this preferences instance, there is
// no need to remove this shell observer.
if (ash::WmShell::HasInstance())
- ash::WmShell::Get()->RemoveShellObserver(this);
+ ash::Shell::GetInstance()->RemoveShellObserver(this);
}
// static

Powered by Google App Engine
This is Rietveld 408576698