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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
« 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/browsing_data_remover.h" 5 #include "chrome/browser/browsing_data_remover.h"
6 6
7 #include <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 base::Time delete_end) 95 base::Time delete_end)
96 : profile_(profile), 96 : profile_(profile),
97 quota_manager_(NULL), 97 quota_manager_(NULL),
98 special_storage_policy_(profile->GetExtensionSpecialStoragePolicy()), 98 special_storage_policy_(profile->GetExtensionSpecialStoragePolicy()),
99 delete_begin_(delete_begin), 99 delete_begin_(delete_begin),
100 delete_end_(delete_end), 100 delete_end_(delete_end),
101 next_cache_state_(STATE_NONE), 101 next_cache_state_(STATE_NONE),
102 cache_(NULL), 102 cache_(NULL),
103 main_context_getter_(profile->GetRequestContext()), 103 main_context_getter_(profile->GetRequestContext()),
104 media_context_getter_(profile->GetRequestContextForMedia()), 104 media_context_getter_(profile->GetRequestContextForMedia()),
105 deauthorize_content_licenses_request_id_(0),
105 waiting_for_clear_cache_(false), 106 waiting_for_clear_cache_(false),
106 waiting_for_clear_cookies_count_(0), 107 waiting_for_clear_cookies_count_(0),
107 waiting_for_clear_history_(false), 108 waiting_for_clear_history_(false),
108 waiting_for_clear_networking_history_(false), 109 waiting_for_clear_networking_history_(false),
109 waiting_for_clear_server_bound_certs_(false), 110 waiting_for_clear_server_bound_certs_(false),
110 waiting_for_clear_plugin_data_(false), 111 waiting_for_clear_plugin_data_(false),
111 waiting_for_clear_quota_managed_data_(false), 112 waiting_for_clear_quota_managed_data_(false),
113 waiting_for_clear_content_licenses_(false),
112 remove_mask_(0), 114 remove_mask_(0),
113 remove_origin_(GURL()), 115 remove_origin_(GURL()),
114 remove_protected_(false) { 116 remove_protected_(false) {
115 DCHECK(profile); 117 DCHECK(profile);
116 } 118 }
117 119
118 BrowsingDataRemover::BrowsingDataRemover(Profile* profile, 120 BrowsingDataRemover::BrowsingDataRemover(Profile* profile,
119 TimePeriod time_period, 121 TimePeriod time_period,
120 base::Time delete_end) 122 base::Time delete_end)
121 : profile_(profile), 123 : profile_(profile),
122 quota_manager_(NULL), 124 quota_manager_(NULL),
123 special_storage_policy_(profile->GetExtensionSpecialStoragePolicy()), 125 special_storage_policy_(profile->GetExtensionSpecialStoragePolicy()),
124 delete_begin_(CalculateBeginDeleteTime(time_period)), 126 delete_begin_(CalculateBeginDeleteTime(time_period)),
125 delete_end_(delete_end), 127 delete_end_(delete_end),
126 next_cache_state_(STATE_NONE), 128 next_cache_state_(STATE_NONE),
127 cache_(NULL), 129 cache_(NULL),
128 main_context_getter_(profile->GetRequestContext()), 130 main_context_getter_(profile->GetRequestContext()),
129 media_context_getter_(profile->GetRequestContextForMedia()), 131 media_context_getter_(profile->GetRequestContextForMedia()),
132 deauthorize_content_licenses_request_id_(0),
130 waiting_for_clear_cache_(false), 133 waiting_for_clear_cache_(false),
131 waiting_for_clear_cookies_count_(0), 134 waiting_for_clear_cookies_count_(0),
132 waiting_for_clear_history_(false), 135 waiting_for_clear_history_(false),
133 waiting_for_clear_networking_history_(false), 136 waiting_for_clear_networking_history_(false),
134 waiting_for_clear_server_bound_certs_(false), 137 waiting_for_clear_server_bound_certs_(false),
135 waiting_for_clear_plugin_data_(false), 138 waiting_for_clear_plugin_data_(false),
136 waiting_for_clear_quota_managed_data_(false), 139 waiting_for_clear_quota_managed_data_(false),
140 waiting_for_clear_content_licenses_(false),
137 remove_mask_(0), 141 remove_mask_(0),
138 remove_origin_(GURL()), 142 remove_origin_(GURL()),
139 remove_protected_(false) { 143 remove_protected_(false) {
140 DCHECK(profile); 144 DCHECK(profile);
141 } 145 }
142 146
143 BrowsingDataRemover::~BrowsingDataRemover() { 147 BrowsingDataRemover::~BrowsingDataRemover() {
144 DCHECK(all_done()); 148 DCHECK(all_done());
145 } 149 }
146 150
(...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after
381 if (prerender_manager) { 385 if (prerender_manager) {
382 prerender_manager->ClearData( 386 prerender_manager->ClearData(
383 prerender::PrerenderManager::CLEAR_PRERENDER_CONTENTS); 387 prerender::PrerenderManager::CLEAR_PRERENDER_CONTENTS);
384 } 388 }
385 } 389 }
386 390
387 if (remove_mask & REMOVE_CONTENT_LICENSES) { 391 if (remove_mask & REMOVE_CONTENT_LICENSES) {
388 content::RecordAction( 392 content::RecordAction(
389 UserMetricsAction("ClearBrowsingData_ContentLicenses")); 393 UserMetricsAction("ClearBrowsingData_ContentLicenses"));
390 394
391 // TODO(yzshen): Implement it. 395 waiting_for_clear_content_licenses_ = true;
396 if (!pepper_flash_settings_manager_.get()) {
397 pepper_flash_settings_manager_.reset(
398 new PepperFlashSettingsManager(this, profile_));
399 }
400 deauthorize_content_licenses_request_id_ =
401 pepper_flash_settings_manager_->DeauthorizeContentLicenses();
392 } 402 }
393 403
394 // Also delete cached network related data (like TransportSecurityState, 404 // Also delete cached network related data (like TransportSecurityState,
395 // HttpServerProperties data). 405 // HttpServerProperties data).
396 profile_->ClearNetworkingHistorySince(delete_begin_); 406 profile_->ClearNetworkingHistorySince(delete_begin_);
397 407
398 NotifyAndDeleteIfDone(); 408 NotifyAndDeleteIfDone();
399 } 409 }
400 410
401 void BrowsingDataRemover::AddObserver(Observer* observer) { 411 void BrowsingDataRemover::AddObserver(Observer* observer) {
(...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after
672 waiting_for_clear_quota_managed_data_ = false; 682 waiting_for_clear_quota_managed_data_ = false;
673 NotifyAndDeleteIfDone(); 683 NotifyAndDeleteIfDone();
674 } 684 }
675 685
676 void BrowsingDataRemover::OnWaitableEventSignaled( 686 void BrowsingDataRemover::OnWaitableEventSignaled(
677 base::WaitableEvent* waitable_event) { 687 base::WaitableEvent* waitable_event) {
678 waiting_for_clear_plugin_data_ = false; 688 waiting_for_clear_plugin_data_ = false;
679 NotifyAndDeleteIfDone(); 689 NotifyAndDeleteIfDone();
680 } 690 }
681 691
692 void BrowsingDataRemover::OnDeauthorizeContentLicensesCompleted(
693 uint32 request_id,
694 bool /* success */) {
695 DCHECK(waiting_for_clear_content_licenses_);
696 DCHECK_EQ(request_id, deauthorize_content_licenses_request_id_);
697
698 waiting_for_clear_content_licenses_ = false;
699 NotifyAndDeleteIfDone();
700 }
701
682 void BrowsingDataRemover::OnClearedCookies(int num_deleted) { 702 void BrowsingDataRemover::OnClearedCookies(int num_deleted) {
683 if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) { 703 if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
684 BrowserThread::PostTask( 704 BrowserThread::PostTask(
685 BrowserThread::UI, FROM_HERE, 705 BrowserThread::UI, FROM_HERE,
686 base::Bind(&BrowsingDataRemover::OnClearedCookies, 706 base::Bind(&BrowsingDataRemover::OnClearedCookies,
687 base::Unretained(this), num_deleted)); 707 base::Unretained(this), num_deleted));
688 return; 708 return;
689 } 709 }
690 710
691 DCHECK(waiting_for_clear_cookies_count_ > 0); 711 DCHECK(waiting_for_clear_cookies_count_ > 0);
(...skipping 23 matching lines...) Expand all
715 BrowserThread::UI, FROM_HERE, 735 BrowserThread::UI, FROM_HERE,
716 base::Bind(&BrowsingDataRemover::OnClearedServerBoundCerts, 736 base::Bind(&BrowsingDataRemover::OnClearedServerBoundCerts,
717 base::Unretained(this))); 737 base::Unretained(this)));
718 } 738 }
719 739
720 void BrowsingDataRemover::OnClearedServerBoundCerts() { 740 void BrowsingDataRemover::OnClearedServerBoundCerts() {
721 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 741 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
722 waiting_for_clear_server_bound_certs_ = false; 742 waiting_for_clear_server_bound_certs_ = false;
723 NotifyAndDeleteIfDone(); 743 NotifyAndDeleteIfDone();
724 } 744 }
OLDNEW
« 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