chrome/browser/chrome_content_browser_client.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/chrome_content_browser_client.cc

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

Patch Set: One more merge to head. 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:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/bookmarks/bookmark_prompt_prefs.cc ('K') | « chrome/browser/chrome_content_browser_client.h ('k') | chrome/browser/chrome_to_mobile_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chrome_content_browser_client.cc

diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc

index ed55104888806f79df61d362554edf6707798333..fa868f82e19467dd2714b5dc62cb48a09fa0aab7 100644

--- a/chrome/browser/chrome_content_browser_client.cc

+++ b/chrome/browser/chrome_content_browser_client.cc

@@ -48,6 +48,7 @@

#include "chrome/browser/notifications/desktop_notification_service_factory.h"

#include "chrome/browser/platform_util.h"

#include "chrome/browser/plugins/plugin_info_message_filter.h"

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

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

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

#include "chrome/browser/prerender/prerender_manager.h"

@@ -494,16 +495,17 @@ ChromeContentBrowserClient::~ChromeContentBrowserClient() {

}

// static

-void ChromeContentBrowserClient::RegisterUserPrefs(PrefServiceSyncable* prefs) {

- prefs->RegisterBooleanPref(prefs::kDisable3DAPIs,

- false,

- PrefServiceSyncable::UNSYNCABLE_PREF);

- prefs->RegisterBooleanPref(prefs::kEnableHyperlinkAuditing,

- true,

- PrefServiceSyncable::UNSYNCABLE_PREF);

- prefs->RegisterBooleanPref(prefs::kEnableMemoryInfo,

- false,

- PrefServiceSyncable::UNSYNCABLE_PREF);

+void ChromeContentBrowserClient::RegisterUserPrefs(

+ PrefRegistrySyncable* registry) {

+ registry->RegisterBooleanPref(prefs::kDisable3DAPIs,

+ false,

+ PrefRegistrySyncable::UNSYNCABLE_PREF);

+ registry->RegisterBooleanPref(prefs::kEnableHyperlinkAuditing,

+ true,

+ PrefRegistrySyncable::UNSYNCABLE_PREF);

+ registry->RegisterBooleanPref(prefs::kEnableMemoryInfo,

+ false,

+ PrefRegistrySyncable::UNSYNCABLE_PREF);

}

content::BrowserMainParts* ChromeContentBrowserClient::CreateBrowserMainParts(