Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1986)

Unified Diff: chrome/browser/ui/webui/options2/clear_browser_data_handler2.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 Brett'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
Index: chrome/browser/ui/webui/options2/clear_browser_data_handler2.cc
diff --git a/chrome/browser/ui/webui/options2/clear_browser_data_handler2.cc b/chrome/browser/ui/webui/options2/clear_browser_data_handler2.cc
index f77e934ec8f4385a3c58a89b9db534f5a22fbe27..60c19bd3f25bee607d0ff1ff1088f57654bbd32d 100644
--- a/chrome/browser/ui/webui/options2/clear_browser_data_handler2.cc
+++ b/chrome/browser/ui/webui/options2/clear_browser_data_handler2.cc
@@ -49,6 +49,8 @@ void ClearBrowserDataHandler::GetLocalizedValues(
{ "deleteCookiesFlashCheckbox", IDS_DEL_COOKIES_FLASH_CHKBOX },
{ "deletePasswordsCheckbox", IDS_DEL_PASSWORDS_CHKBOX },
{ "deleteFormDataCheckbox", IDS_DEL_FORM_DATA_CHKBOX },
+ { "deauthorizeContentLicensesCheckbox",
+ IDS_DEAUTHORIZE_CONTENT_LICENSES_CHKBOX },
{ "clearBrowserDataCommit", IDS_CLEAR_BROWSING_DATA_COMMIT },
{ "flash_storage_url", IDS_FLASH_STORAGE_URL },
};
@@ -114,6 +116,8 @@ void ClearBrowserDataHandler::HandleClearBrowserData(const ListValue* value) {
remove_mask |= BrowsingDataRemover::REMOVE_PASSWORDS;
if (prefs->GetBoolean(prefs::kDeleteFormData))
remove_mask |= BrowsingDataRemover::REMOVE_FORM_DATA;
+ if (prefs->GetBoolean(prefs::kDeauthorizeContentLicenses))
+ remove_mask |= BrowsingDataRemover::REMOVE_CONTENT_LICENSES;
int period_selected = prefs->GetInteger(prefs::kDeleteTimePeriod);

Powered by Google App Engine
This is Rietveld 408576698