chrome/browser/ui/alternate_error_tab_observer.cc - Issue 12079097: Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 12079097: Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merge to head again; base::File changes conflicted. Created 7 years, 10 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:

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 205ab6a851c5cff1a7145dd5d671e00eb2a77bf1..ed4ac3ff60bc0a4c9fb99b4e2db196aa61ea4ea5 100644

--- a/chrome/browser/ui/alternate_error_tab_observer.cc

+++ b/chrome/browser/ui/alternate_error_tab_observer.cc

@@ -5,6 +5,7 @@

#include "chrome/browser/ui/alternate_error_tab_observer.h"

#include "chrome/browser/google/google_util.h"

+#include "chrome/browser/prefs/pref_registry_syncable.h"

#include "chrome/browser/prefs/pref_service.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/common/chrome_notification_types.h"

@@ -22,7 +23,7 @@ AlternateErrorPageTabObserver::AlternateErrorPageTabObserver(

WebContents* web_contents)

: content::WebContentsObserver(web_contents),

profile_(Profile::FromBrowserContext(web_contents->GetBrowserContext())) {

- PrefServiceSyncable* prefs = profile_->GetPrefs();

+ PrefService* prefs = profile_->GetPrefs();

if (prefs) {

pref_change_registrar_.Init(prefs);

pref_change_registrar_.Add(

@@ -41,9 +42,9 @@ AlternateErrorPageTabObserver::~AlternateErrorPageTabObserver() {

// static

void AlternateErrorPageTabObserver::RegisterUserPrefs(

- PrefServiceSyncable* prefs) {

+ PrefRegistrySyncable* prefs) {

prefs->RegisterBooleanPref(prefs::kAlternateErrorPagesEnabled, true,

- PrefServiceSyncable::SYNCABLE_PREF);

+ PrefRegistrySyncable::SYNCABLE_PREF);

}

////////////////////////////////////////////////////////////////////////////////