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

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: Fix removal of PrefServiceObserver usage. Created 8 years 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..6bac4c32d1d8a29081c3ddccaf34bc91e9291d12 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,
+ 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());
« no previous file with comments | « chrome/browser/ui/alternate_error_tab_observer.h ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698