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

Side by Side Diff: chrome/browser/browsing_data_remover.cc

Issue 7387010: Add PluginServiceFilter interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix unit test Created 9 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/browser_process_impl.cc ('k') | chrome/browser/chrome_plugin_service_filter.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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/callback.h" 10 #include "base/callback.h"
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after
269 prerender_manager->ClearData( 269 prerender_manager->ClearData(
270 prerender::PrerenderManager::CLEAR_PRERENDER_CONTENTS); 270 prerender::PrerenderManager::CLEAR_PRERENDER_CONTENTS);
271 } 271 }
272 } 272 }
273 273
274 if (remove_mask & REMOVE_LSO_DATA) { 274 if (remove_mask & REMOVE_LSO_DATA) {
275 UserMetrics::RecordAction(UserMetricsAction("ClearBrowsingData_LSOData")); 275 UserMetrics::RecordAction(UserMetricsAction("ClearBrowsingData_LSOData"));
276 276
277 waiting_for_clear_lso_data_ = true; 277 waiting_for_clear_lso_data_ = true;
278 if (!plugin_data_remover_.get()) 278 if (!plugin_data_remover_.get())
279 plugin_data_remover_ = new PluginDataRemover(); 279 plugin_data_remover_ = new PluginDataRemover(profile_);
280 base::WaitableEvent* event = 280 base::WaitableEvent* event =
281 plugin_data_remover_->StartRemoving(delete_begin_); 281 plugin_data_remover_->StartRemoving(delete_begin_);
282 watcher_.StartWatching(event, this); 282 watcher_.StartWatching(event, this);
283 } 283 }
284 284
285 NotifyAndDeleteIfDone(); 285 NotifyAndDeleteIfDone();
286 } 286 }
287 287
288 void BrowsingDataRemover::AddObserver(Observer* observer) { 288 void BrowsingDataRemover::AddObserver(Observer* observer) {
289 observer_list_.AddObserver(observer); 289 observer_list_.AddObserver(observer);
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
530 NewRunnableMethod( 530 NewRunnableMethod(
531 this, 531 this,
532 &BrowsingDataRemover::NotifyAndDeleteIfDone)); 532 &BrowsingDataRemover::NotifyAndDeleteIfDone));
533 } 533 }
534 534
535 void BrowsingDataRemover::OnWaitableEventSignaled( 535 void BrowsingDataRemover::OnWaitableEventSignaled(
536 base::WaitableEvent* waitable_event) { 536 base::WaitableEvent* waitable_event) {
537 waiting_for_clear_lso_data_ = false; 537 waiting_for_clear_lso_data_ = false;
538 NotifyAndDeleteIfDone(); 538 NotifyAndDeleteIfDone();
539 } 539 }
OLDNEW
« no previous file with comments | « chrome/browser/browser_process_impl.cc ('k') | chrome/browser/chrome_plugin_service_filter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698