chrome/browser/ui/browser.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/ui/browser.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: . 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/resources/options2/clear_browser_data_overlay.html ('K') | « chrome/browser/resources/options2/options_page.js ('k') | chrome/browser/ui/webui/options2/clear_browser_data_handler2.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/browser.cc

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

index 70e926bf0e8fa601037d25de574c8c7eb990423a..90cdc82f8e670dc848be257decc92ac4f897d224 100644

--- a/chrome/browser/ui/browser.cc

+++ b/chrome/browser/ui/browser.cc

@@ -2384,6 +2384,9 @@ void Browser::RegisterUserPrefs(PrefService* prefs) {

prefs->RegisterBooleanPref(prefs::kDeleteFormData,

false,

PrefService::SYNCABLE_PREF);

+ prefs->RegisterBooleanPref(prefs::kDeauthorizeContentLicenses,

+ false,

+ PrefService::UNSYNCABLE_PREF);

prefs->RegisterIntegerPref(prefs::kDeleteTimePeriod,

PrefService::SYNCABLE_PREF);

@@ -2466,6 +2469,9 @@ void Browser::RegisterUserPrefs(PrefService* prefs) {

prefs->RegisterBooleanPref(prefs::kClearPluginLSODataEnabled,

true,

PrefService::UNSYNCABLE_PREF);

+ prefs->RegisterBooleanPref(prefs::kPepperFlashSettingsEnabled,

+ true,

+ PrefService::UNSYNCABLE_PREF);

prefs->RegisterBooleanPref(prefs::kEnableMemoryInfo,

false,

PrefService::UNSYNCABLE_PREF);