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

diff --git a/chrome/browser/intents/web_intents_util.cc b/chrome/browser/intents/web_intents_util.cc

index 868d8d073f53f23446a79545e48b2507871e314b..0624a10864eb4a8144cde3098be5e77deecba831 100644

--- a/chrome/browser/intents/web_intents_util.cc

+++ b/chrome/browser/intents/web_intents_util.cc

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

#include "base/command_line.h"

#include "base/string_util.h"

#include "base/utf_string_conversions.h"

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

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

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

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

@@ -59,9 +60,9 @@ const char kQuickOfficeViewerServiceURL[] =

const char kQuickOfficeViewerDevServiceURL[] =

"chrome-extension://ionpfmkccalenbmnddpbmocokhaknphg/views/appEditor.html";

-void RegisterUserPrefs(PrefServiceSyncable* user_prefs) {

- user_prefs->RegisterBooleanPref(prefs::kWebIntentsEnabled, true,

- PrefServiceSyncable::SYNCABLE_PREF);

+void RegisterUserPrefs(PrefRegistrySyncable* registry) {

+ registry->RegisterBooleanPref(prefs::kWebIntentsEnabled, true,

+ PrefRegistrySyncable::SYNCABLE_PREF);

}

bool IsWebIntentsEnabled(PrefService* prefs) {