| OLD | NEW |
| 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 295 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 306 prerender_manager->ClearData( | 306 prerender_manager->ClearData( |
| 307 prerender::PrerenderManager::CLEAR_PRERENDER_CONTENTS); | 307 prerender::PrerenderManager::CLEAR_PRERENDER_CONTENTS); |
| 308 } | 308 } |
| 309 } | 309 } |
| 310 | 310 |
| 311 if (remove_mask & REMOVE_LSO_DATA) { | 311 if (remove_mask & REMOVE_LSO_DATA) { |
| 312 UserMetrics::RecordAction(UserMetricsAction("ClearBrowsingData_LSOData")); | 312 UserMetrics::RecordAction(UserMetricsAction("ClearBrowsingData_LSOData")); |
| 313 | 313 |
| 314 waiting_for_clear_lso_data_ = true; | 314 waiting_for_clear_lso_data_ = true; |
| 315 if (!plugin_data_remover_.get()) | 315 if (!plugin_data_remover_.get()) |
| 316 plugin_data_remover_ = new PluginDataRemover(); | 316 plugin_data_remover_ = new PluginDataRemover(profile_); |
| 317 base::WaitableEvent* event = | 317 base::WaitableEvent* event = |
| 318 plugin_data_remover_->StartRemoving(delete_begin_); | 318 plugin_data_remover_->StartRemoving(delete_begin_); |
| 319 watcher_.StartWatching(event, this); | 319 watcher_.StartWatching(event, this); |
| 320 } | 320 } |
| 321 | 321 |
| 322 NotifyAndDeleteIfDone(); | 322 NotifyAndDeleteIfDone(); |
| 323 } | 323 } |
| 324 | 324 |
| 325 void BrowsingDataRemover::AddObserver(Observer* observer) { | 325 void BrowsingDataRemover::AddObserver(Observer* observer) { |
| 326 observer_list_.AddObserver(observer); | 326 observer_list_.AddObserver(observer); |
| (...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 626 | 626 |
| 627 ClearGearsData(profile_dir); | 627 ClearGearsData(profile_dir); |
| 628 OnClearedGearsData(); | 628 OnClearedGearsData(); |
| 629 } | 629 } |
| 630 | 630 |
| 631 void BrowsingDataRemover::OnWaitableEventSignaled( | 631 void BrowsingDataRemover::OnWaitableEventSignaled( |
| 632 base::WaitableEvent* waitable_event) { | 632 base::WaitableEvent* waitable_event) { |
| 633 waiting_for_clear_lso_data_ = false; | 633 waiting_for_clear_lso_data_ = false; |
| 634 NotifyAndDeleteIfDone(); | 634 NotifyAndDeleteIfDone(); |
| 635 } | 635 } |
| OLD | NEW |