chrome/browser/extensions/api/tabs/tabs_api.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/extensions/api/tabs/tabs_api.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/extensions/api/tabs/tabs_api.cc

diff --git a/chrome/browser/extensions/api/tabs/tabs_api.cc b/chrome/browser/extensions/api/tabs/tabs_api.cc

index cfc2d29bc26697c1bb10180fbfd762b8931c5e89..2d2da44bba05035b6dee35e352618601f0bc6ef5 100644

--- a/chrome/browser/extensions/api/tabs/tabs_api.cc

+++ b/chrome/browser/extensions/api/tabs/tabs_api.cc

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

#include "chrome/browser/extensions/window_controller.h"

#include "chrome/browser/extensions/window_controller_list.h"

#include "chrome/browser/prefs/incognito_mode_prefs.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/translate/translate_tab_helper.h"

@@ -1813,9 +1814,9 @@ void TabsCaptureVisibleTabFunction::SendResultFromBitmap(

}

void TabsCaptureVisibleTabFunction::RegisterUserPrefs(

- PrefServiceSyncable* service) {

- service->RegisterBooleanPref(prefs::kDisableScreenshots, false,

- PrefServiceSyncable::UNSYNCABLE_PREF);

+ PrefRegistrySyncable* registry) {

+ registry->RegisterBooleanPref(prefs::kDisableScreenshots, false,

+ PrefRegistrySyncable::UNSYNCABLE_PREF);

}

bool TabsDetectLanguageFunction::RunImpl() {