chrome/browser/pepper_flash_settings_manager.h - 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/pepper_flash_settings_manager.h

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/pepper_flash_settings_manager.h

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

index 4ff992e9ca13319b9c87668c150f2ab1322220a6..77c9d537482e3b0b4db0029589efa8a8f3e6d1b6 100644

--- a/chrome/browser/pepper_flash_settings_manager.h

+++ b/chrome/browser/pepper_flash_settings_manager.h

@@ -12,7 +12,7 @@

#include "ppapi/shared_impl/ppp_flash_browser_operations_shared.h"

class PluginPrefs;

-class PrefServiceSyncable;

+class PrefRegistrySyncable;

namespace content {

class BrowserContext;

@@ -62,7 +62,7 @@ class PepperFlashSettingsManager {

static bool IsPepperFlashInUse(PluginPrefs* plugin_prefs,

webkit::WebPluginInfo* plugin_info);

- static void RegisterUserPrefs(PrefServiceSyncable* prefs);

+ static void RegisterUserPrefs(PrefRegistrySyncable* registry);

// Requests to deauthorize content licenses.

// Client::OnDeauthorizeContentLicensesCompleted() will be called when the