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

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

Issue 6308001: When clearing plugin data at shutdown, wait for it to finish. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: whoops Created 9 years, 11 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
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 244 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 } 255 }
256 256
257 if (remove_mask & REMOVE_LSO_DATA) { 257 if (remove_mask & REMOVE_LSO_DATA) {
258 UserMetrics::RecordAction(UserMetricsAction("ClearBrowsingData_LSOData")); 258 UserMetrics::RecordAction(UserMetricsAction("ClearBrowsingData_LSOData"));
259 259
260 waiting_for_clear_lso_data_ = true; 260 waiting_for_clear_lso_data_ = true;
261 if (!plugin_data_remover_.get()) 261 if (!plugin_data_remover_.get())
262 plugin_data_remover_ = new PluginDataRemover(); 262 plugin_data_remover_ = new PluginDataRemover();
263 plugin_data_remover_->StartRemoving( 263 plugin_data_remover_->StartRemoving(
264 delete_begin_, 264 delete_begin_,
265 false,
265 NewRunnableMethod(this, &BrowsingDataRemover::OnClearedPluginData)); 266 NewRunnableMethod(this, &BrowsingDataRemover::OnClearedPluginData));
266 } 267 }
267 268
268 NotifyAndDeleteIfDone(); 269 NotifyAndDeleteIfDone();
269 } 270 }
270 271
271 void BrowsingDataRemover::AddObserver(Observer* observer) { 272 void BrowsingDataRemover::AddObserver(Observer* observer) {
272 observer_list_.AddObserver(observer); 273 observer_list_.AddObserver(observer);
273 } 274 }
274 275
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
506 reinterpret_cast<ChromeURLRequestContext*>( 507 reinterpret_cast<ChromeURLRequestContext*>(
507 request_context_getter_->GetURLRequestContext()); 508 request_context_getter_->GetURLRequestContext());
508 return request_context ? request_context->appcache_service() 509 return request_context ? request_context->appcache_service()
509 : NULL; 510 : NULL;
510 } 511 }
511 512
512 void BrowsingDataRemover::OnClearedPluginData() { 513 void BrowsingDataRemover::OnClearedPluginData() {
513 waiting_for_clear_lso_data_ = false; 514 waiting_for_clear_lso_data_ = false;
514 NotifyAndDeleteIfDone(); 515 NotifyAndDeleteIfDone();
515 } 516 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698