chrome/browser/pepper_flash_settings_manager.cc - Issue 11570009: Split PrefService into PrefService, PrefServiceSimple and 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/pepper_flash_settings_manager.cc

Issue 11570009: Split PrefService into PrefService, PrefServiceSimple and PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address review comments. 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

« chrome/browser/extensions/app_notify_channel_setup_unittest.cc ('K') | « chrome/browser/pepper_flash_settings_manager.h ('k') | chrome/browser/plugins/plugin_finder.h » ('j') | chrome/browser/prefs/pref_service_simple.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/pepper_flash_settings_manager.cc

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

index 97fa3103d09b577f21809a33a0b6e590fcc91776..3f78afeba927fd0ac610b2e6d1f8cdfab24ded01 100644

--- a/chrome/browser/pepper_flash_settings_manager.cc

+++ b/chrome/browser/pepper_flash_settings_manager.cc

@@ -927,14 +927,14 @@ bool PepperFlashSettingsManager::IsPepperFlashInUse(

}

// static

-void PepperFlashSettingsManager::RegisterUserPrefs(PrefService* prefs) {

+void PepperFlashSettingsManager::RegisterUserPrefs(PrefServiceSyncable* prefs) {

prefs->RegisterBooleanPref(prefs::kDeauthorizeContentLicenses,

false,

- PrefService::UNSYNCABLE_PREF);

+ PrefServiceSyncable::UNSYNCABLE_PREF);

prefs->RegisterBooleanPref(prefs::kPepperFlashSettingsEnabled,

true,

- PrefService::UNSYNCABLE_PREF);

+ PrefServiceSyncable::UNSYNCABLE_PREF);

}

uint32 PepperFlashSettingsManager::DeauthorizeContentLicenses() {