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

Unified Diff: chrome/browser/pepper_flash_settings_manager.cc

Issue 2075023002: UI Changes to support clearing EME/CDM data (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: revert options_page.css 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
Index: chrome/browser/pepper_flash_settings_manager.cc
diff --git a/chrome/browser/pepper_flash_settings_manager.cc b/chrome/browser/pepper_flash_settings_manager.cc
index 9cf779fd35127b97bb941b8b2cc556fd8c692b86..c1e2d356a8fb2d272757f8bcf17b7f22c91c4d8b 100644
--- a/chrome/browser/pepper_flash_settings_manager.cc
+++ b/chrome/browser/pepper_flash_settings_manager.cc
@@ -682,8 +682,8 @@ void PepperFlashSettingsManager::Core::
DCHECK_CURRENTLY_ON(BrowserThread::UI);
if (manager_.get()) {
- manager_->client_->OnDeauthorizeContentLicensesCompleted(
- request_id, success);
+ manager_->client_->OnDeauthorizeFlashContentLicensesCompleted(request_id,
+ success);
}
}
@@ -760,7 +760,7 @@ void PepperFlashSettingsManager::Core::NotifyError(
NOTREACHED();
break;
case DEAUTHORIZE_CONTENT_LICENSES:
- manager_->client_->OnDeauthorizeContentLicensesCompleted(
+ manager_->client_->OnDeauthorizeFlashContentLicensesCompleted(
iter->first, false);
break;
case GET_PERMISSION_SETTINGS:
@@ -970,8 +970,6 @@ bool PepperFlashSettingsManager::IsPepperFlashInUse(
// static
void PepperFlashSettingsManager::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
- registry->RegisterBooleanPref(prefs::kDeauthorizeContentLicenses, false);
-
registry->RegisterBooleanPref(prefs::kPepperFlashSettingsEnabled, true);
}
« no previous file with comments | « chrome/browser/pepper_flash_settings_manager.h ('k') | chrome/browser/resources/options/clear_browser_data_overlay.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698