chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc - Issue 2075023002: UI Changes to support clearing EME/CDM data

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/webui/settings/settings_clear_browsing_data_handler.cc

Issue 2075023002: UI Changes to support clearing EME/CDM data (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Media licenses everywhere Created 4 years, 6 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/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.html ('K') | « chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc

diff --git a/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc b/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc

index ac540c0a011704314a55c04370aa4e2778bebfe0..7eaa1b11eeb7a7c39a14c9ad2d1720ad02a1241d 100644

--- a/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc

+++ b/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc

@@ -106,11 +106,8 @@ void ClearBrowsingDataHandler::HandleClearBrowsingData(

if (prefs->GetBoolean(prefs::kDeleteFormData))

remove_mask |= BrowsingDataRemover::REMOVE_FORM_DATA;

- // Clearing Content Licenses is only supported in Pepper Flash.

- if (prefs->GetBoolean(prefs::kDeauthorizeContentLicenses) &&

- *pepper_flash_settings_enabled_) {

- remove_mask |= BrowsingDataRemover::REMOVE_CONTENT_LICENSES;

- }

+ if (prefs->GetBoolean(prefs::kDeleteMediaLicenses))

+ remove_mask |= BrowsingDataRemover::REMOVE_MEDIA_LICENSES;

if (prefs->GetBoolean(prefs::kDeleteHostedAppsData)) {

remove_mask |= site_data_mask;

@@ -141,7 +138,7 @@ void ClearBrowsingDataHandler::HandleClearBrowsingData(

prefs::kDeleteCookies,

prefs::kDeleteFormData,

prefs::kDeleteHostedAppsData,

- prefs::kDeauthorizeContentLicenses,

+ prefs::kDeleteMediaLicenses,

};

static size_t num_other_types = arraysize(other_types);

int checked_other_types = std::count_if(