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

Unified Diff: chrome/browser/ui/alternate_error_tab_observer.cc

Issue 11280115: Remove PrefObserver usages, batch 12. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Self review. Created 8 years, 1 month 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/ui/alternate_error_tab_observer.cc
diff --git a/chrome/browser/ui/alternate_error_tab_observer.cc b/chrome/browser/ui/alternate_error_tab_observer.cc
index 569a739389972154f8eed7b7af5e64e29d325f68..1a6247a6c73c2e7c369ac37164f6bb6175742157 100644
--- a/chrome/browser/ui/alternate_error_tab_observer.cc
+++ b/chrome/browser/ui/alternate_error_tab_observer.cc
@@ -25,7 +25,11 @@ AlternateErrorPageTabObserver::AlternateErrorPageTabObserver(
PrefService* prefs = profile_->GetPrefs();
if (prefs) {
pref_change_registrar_.Init(prefs);
- pref_change_registrar_.Add(prefs::kAlternateErrorPagesEnabled, this);
+ pref_change_registrar_.Add(
+ prefs::kAlternateErrorPagesEnabled,
+ base::Bind(&AlternateErrorPageTabObserver::
+ OnAlternateErrorPagesEnabledChanged,
Mattias Nissler (ping if slow) 2012/11/21 11:31:04 Indent by 4? I don't know what the style rule is t
Jói 2012/11/21 12:59:33 Done.
+ base::Unretained(this)));
}
registrar_.Add(this, chrome::NOTIFICATION_GOOGLE_URL_UPDATED,
@@ -61,17 +65,6 @@ void AlternateErrorPageTabObserver::Observe(
}
////////////////////////////////////////////////////////////////////////////////
-// PrefObserver overrides
-
-void AlternateErrorPageTabObserver::OnPreferenceChanged(
- PrefServiceBase* service,
- const std::string& pref_name) {
- DCHECK_EQ(profile_->GetPrefs(), service);
- DCHECK(prefs::kAlternateErrorPagesEnabled == pref_name);
- UpdateAlternateErrorPageURL(web_contents()->GetRenderViewHost());
-}
-
-////////////////////////////////////////////////////////////////////////////////
// Internal helpers
GURL AlternateErrorPageTabObserver::GetAlternateErrorPageURL() const {
@@ -90,6 +83,10 @@ GURL AlternateErrorPageTabObserver::GetAlternateErrorPageURL() const {
return url;
}
+void AlternateErrorPageTabObserver::OnAlternateErrorPagesEnabledChanged() {
+ UpdateAlternateErrorPageURL(web_contents()->GetRenderViewHost());
+}
+
void AlternateErrorPageTabObserver::UpdateAlternateErrorPageURL(
RenderViewHost* rvh) {
rvh->SetAltErrorPageURL(GetAlternateErrorPageURL());

Powered by Google App Engine
This is Rietveld 408576698