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

Unified Diff: chrome/browser/ui/webui/options/clear_browser_data_handler.cc

Issue 11000022: Sanity checks to make sure we are not trying to clear Content Licenses when Flash Pepper is not in … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 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
« no previous file with comments | « chrome/browser/ui/webui/options/clear_browser_data_handler.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/options/clear_browser_data_handler.cc
diff --git a/chrome/browser/ui/webui/options/clear_browser_data_handler.cc b/chrome/browser/ui/webui/options/clear_browser_data_handler.cc
index d1bd73e1846435aae87159da938b6bc6732cbe27..5a580f954bcf24ef0fe8c1819357d4eb094671eb 100644
--- a/chrome/browser/ui/webui/options/clear_browser_data_handler.cc
+++ b/chrome/browser/ui/webui/options/clear_browser_data_handler.cc
@@ -43,6 +43,9 @@ void ClearBrowserDataHandler::InitializeHandler() {
clear_plugin_lso_data_enabled_.Init(prefs::kClearPluginLSODataEnabled,
Profile::FromWebUI(web_ui())->GetPrefs(),
NULL);
+ pepper_flash_settings_enabled_.Init(prefs::kPepperFlashSettingsEnabled,
+ Profile::FromWebUI(web_ui())->GetPrefs(),
+ NULL);
}
void ClearBrowserDataHandler::GetLocalizedValues(
@@ -135,8 +138,11 @@ 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))
+ // 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::kDeleteHostedAppsData)) {
remove_mask |= site_data_mask;
origin_mask |= BrowsingDataHelper::PROTECTED_WEB;
« no previous file with comments | « chrome/browser/ui/webui/options/clear_browser_data_handler.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698