chrome/browser/prefs/browser_prefs.cc - Issue 10387161: Pepper Flash settings integration: add UI for "deauthorize content licenses".

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/prefs/browser_prefs.cc

Issue 10387161: Pepper Flash settings integration: add UI for "deauthorize content licenses". (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Changes in response to Scott's suggestions Created 8 years, 7 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/pepper_flash_settings_manager.h ('K') | « chrome/browser/plugin_status_pref_setter.cc ('k') | chrome/browser/resources/options2/clear_browser_data_overlay.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/prefs/browser_prefs.cc

diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc

index d0c2361bd207f045b66a3709a9515b6e610f6c0b..5bdb1591293eebe36b62dc2201605de8486de913 100644

--- a/chrome/browser/prefs/browser_prefs.cc

+++ b/chrome/browser/prefs/browser_prefs.cc

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

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

#include "chrome/browser/page_info_model.h"

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

+#include "chrome/browser/pepper_flash_settings_manager.h"

#include "chrome/browser/policy/cloud_policy_subsystem.h"

#include "chrome/browser/policy/url_blacklist_manager.h"

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

@@ -221,6 +222,7 @@ void RegisterUserPrefs(PrefService* user_prefs) {

Browser::RegisterUserPrefs(user_prefs);

browser::RegisterAutolaunchPrefs(user_prefs);

DevToolsWindow::RegisterUserPrefs(user_prefs);

+ PepperFlashSettingsManager::RegisterUserPrefs(user_prefs);

PinnedTabCodec::RegisterUserPrefs(user_prefs);

PluginsUI::RegisterUserPrefs(user_prefs);

PromoResourceService::RegisterUserPrefs(user_prefs);