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

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

Issue 7477044: Use PluginPrefs in ChromePluginServiceFilter to check whether a plugin is enabled. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sync Created 9 years, 4 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 253 matching lines...) Expand 10 before | Expand all | Expand 10 after
264 prerender_manager->ClearData( 264 prerender_manager->ClearData(
265 prerender::PrerenderManager::CLEAR_PRERENDER_CONTENTS); 265 prerender::PrerenderManager::CLEAR_PRERENDER_CONTENTS);
266 } 266 }
267 } 267 }
268 268
269 if (remove_mask & REMOVE_LSO_DATA) { 269 if (remove_mask & REMOVE_LSO_DATA) {
270 UserMetrics::RecordAction(UserMetricsAction("ClearBrowsingData_LSOData")); 270 UserMetrics::RecordAction(UserMetricsAction("ClearBrowsingData_LSOData"));
271 271
272 waiting_for_clear_lso_data_ = true; 272 waiting_for_clear_lso_data_ = true;
273 if (!plugin_data_remover_.get()) 273 if (!plugin_data_remover_.get())
274 plugin_data_remover_ = new PluginDataRemover(); 274 plugin_data_remover_ = new PluginDataRemover(profile_);
275 base::WaitableEvent* event = 275 base::WaitableEvent* event =
276 plugin_data_remover_->StartRemoving(delete_begin_); 276 plugin_data_remover_->StartRemoving(delete_begin_);
277 watcher_.StartWatching(event, this); 277 watcher_.StartWatching(event, this);
278 } 278 }
279 279
280 NotifyAndDeleteIfDone(); 280 NotifyAndDeleteIfDone();
281 } 281 }
282 282
283 void BrowsingDataRemover::AddObserver(Observer* observer) { 283 void BrowsingDataRemover::AddObserver(Observer* observer) {
284 observer_list_.AddObserver(observer); 284 observer_list_.AddObserver(observer);
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
525 NewRunnableMethod( 525 NewRunnableMethod(
526 this, 526 this,
527 &BrowsingDataRemover::NotifyAndDeleteIfDone)); 527 &BrowsingDataRemover::NotifyAndDeleteIfDone));
528 } 528 }
529 529
530 void BrowsingDataRemover::OnWaitableEventSignaled( 530 void BrowsingDataRemover::OnWaitableEventSignaled(
531 base::WaitableEvent* waitable_event) { 531 base::WaitableEvent* waitable_event) {
532 waiting_for_clear_lso_data_ = false; 532 waiting_for_clear_lso_data_ = false;
533 NotifyAndDeleteIfDone(); 533 NotifyAndDeleteIfDone();
534 } 534 }
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