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

Unified Diff: chrome/browser/browsing_data_remover.cc

Issue 10391173: Pepper Flash settings integration: implement "deauthorize content licenses". (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase 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
« no previous file with comments | « chrome/browser/browsing_data_remover.h ('k') | chrome/browser/pepper_flash_settings_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/browsing_data_remover.cc
diff --git a/chrome/browser/browsing_data_remover.cc b/chrome/browser/browsing_data_remover.cc
index afb736373e447679b8668a0eaa3ffb064eb50d62..592cc8066e82dbcd7c32889d5396896f007b0f87 100644
--- a/chrome/browser/browsing_data_remover.cc
+++ b/chrome/browser/browsing_data_remover.cc
@@ -102,6 +102,7 @@ BrowsingDataRemover::BrowsingDataRemover(Profile* profile,
cache_(NULL),
main_context_getter_(profile->GetRequestContext()),
media_context_getter_(profile->GetRequestContextForMedia()),
+ deauthorize_content_licenses_request_id_(0),
waiting_for_clear_cache_(false),
waiting_for_clear_cookies_count_(0),
waiting_for_clear_history_(false),
@@ -109,6 +110,7 @@ BrowsingDataRemover::BrowsingDataRemover(Profile* profile,
waiting_for_clear_server_bound_certs_(false),
waiting_for_clear_plugin_data_(false),
waiting_for_clear_quota_managed_data_(false),
+ waiting_for_clear_content_licenses_(false),
remove_mask_(0),
remove_origin_(GURL()),
remove_protected_(false) {
@@ -127,6 +129,7 @@ BrowsingDataRemover::BrowsingDataRemover(Profile* profile,
cache_(NULL),
main_context_getter_(profile->GetRequestContext()),
media_context_getter_(profile->GetRequestContextForMedia()),
+ deauthorize_content_licenses_request_id_(0),
waiting_for_clear_cache_(false),
waiting_for_clear_cookies_count_(0),
waiting_for_clear_history_(false),
@@ -134,6 +137,7 @@ BrowsingDataRemover::BrowsingDataRemover(Profile* profile,
waiting_for_clear_server_bound_certs_(false),
waiting_for_clear_plugin_data_(false),
waiting_for_clear_quota_managed_data_(false),
+ waiting_for_clear_content_licenses_(false),
remove_mask_(0),
remove_origin_(GURL()),
remove_protected_(false) {
@@ -388,7 +392,13 @@ void BrowsingDataRemover::RemoveImpl(int remove_mask,
content::RecordAction(
UserMetricsAction("ClearBrowsingData_ContentLicenses"));
- // TODO(yzshen): Implement it.
+ waiting_for_clear_content_licenses_ = true;
+ if (!pepper_flash_settings_manager_.get()) {
+ pepper_flash_settings_manager_.reset(
+ new PepperFlashSettingsManager(this, profile_));
+ }
+ deauthorize_content_licenses_request_id_ =
+ pepper_flash_settings_manager_->DeauthorizeContentLicenses();
}
// Also delete cached network related data (like TransportSecurityState,
@@ -679,6 +689,16 @@ void BrowsingDataRemover::OnWaitableEventSignaled(
NotifyAndDeleteIfDone();
}
+void BrowsingDataRemover::OnDeauthorizeContentLicensesCompleted(
+ uint32 request_id,
+ bool /* success */) {
+ DCHECK(waiting_for_clear_content_licenses_);
+ DCHECK_EQ(request_id, deauthorize_content_licenses_request_id_);
+
+ waiting_for_clear_content_licenses_ = false;
+ NotifyAndDeleteIfDone();
+}
+
void BrowsingDataRemover::OnClearedCookies(int num_deleted) {
if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
BrowserThread::PostTask(
« no previous file with comments | « chrome/browser/browsing_data_remover.h ('k') | chrome/browser/pepper_flash_settings_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698