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

Side by Side Diff: chrome/browser/browsing_data_remover.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: . 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 366 matching lines...) Expand 10 before | Expand all | Expand 10 after
377 // The PrerenderManager may have a page actively being prerendered, which 377 // The PrerenderManager may have a page actively being prerendered, which
378 // is essentially a preemptively cached page. 378 // is essentially a preemptively cached page.
379 prerender::PrerenderManager* prerender_manager = 379 prerender::PrerenderManager* prerender_manager =
380 prerender::PrerenderManagerFactory::GetForProfile(profile_); 380 prerender::PrerenderManagerFactory::GetForProfile(profile_);
381 if (prerender_manager) { 381 if (prerender_manager) {
382 prerender_manager->ClearData( 382 prerender_manager->ClearData(
383 prerender::PrerenderManager::CLEAR_PRERENDER_CONTENTS); 383 prerender::PrerenderManager::CLEAR_PRERENDER_CONTENTS);
384 } 384 }
385 } 385 }
386 386
387 if (remove_mask & REMOVE_CONTENT_LICENSES) {
388 content::RecordAction(
389 UserMetricsAction("ClearBrowsingData_ContentLicenses"));
390
391 // TODO(yzshen): Implement it.
392 }
393
387 // Also delete cached network related data (like TransportSecurityState, 394 // Also delete cached network related data (like TransportSecurityState,
388 // HttpServerProperties data). 395 // HttpServerProperties data).
389 profile_->ClearNetworkingHistorySince(delete_begin_); 396 profile_->ClearNetworkingHistorySince(delete_begin_);
390 397
391 NotifyAndDeleteIfDone(); 398 NotifyAndDeleteIfDone();
392 } 399 }
393 400
394 void BrowsingDataRemover::AddObserver(Observer* observer) { 401 void BrowsingDataRemover::AddObserver(Observer* observer) {
395 observer_list_.AddObserver(observer); 402 observer_list_.AddObserver(observer);
396 } 403 }
(...skipping 311 matching lines...) Expand 10 before | Expand all | Expand 10 after
708 BrowserThread::UI, FROM_HERE, 715 BrowserThread::UI, FROM_HERE,
709 base::Bind(&BrowsingDataRemover::OnClearedServerBoundCerts, 716 base::Bind(&BrowsingDataRemover::OnClearedServerBoundCerts,
710 base::Unretained(this))); 717 base::Unretained(this)));
711 } 718 }
712 719
713 void BrowsingDataRemover::OnClearedServerBoundCerts() { 720 void BrowsingDataRemover::OnClearedServerBoundCerts() {
714 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 721 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
715 waiting_for_clear_server_bound_certs_ = false; 722 waiting_for_clear_server_bound_certs_ = false;
716 NotifyAndDeleteIfDone(); 723 NotifyAndDeleteIfDone();
717 } 724 }
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