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/profiles/profile_io_data.h" | 5 #include "chrome/browser/profiles/profile_io_data.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
11 #include "base/bind_helpers.h" | 11 #include "base/bind_helpers.h" |
12 #include "base/command_line.h" | 12 #include "base/command_line.h" |
13 #include "base/compiler_specific.h" | 13 #include "base/compiler_specific.h" |
14 #include "base/logging.h" | 14 #include "base/logging.h" |
15 #include "base/stl_util.h" | 15 #include "base/stl_util.h" |
16 #include "base/string_number_conversions.h" | 16 #include "base/string_number_conversions.h" |
17 #include "base/task.h" | |
18 #include "chrome/browser/browser_process.h" | 17 #include "chrome/browser/browser_process.h" |
19 #include "chrome/browser/content_settings/cookie_settings.h" | 18 #include "chrome/browser/content_settings/cookie_settings.h" |
20 #include "chrome/browser/content_settings/host_content_settings_map.h" | 19 #include "chrome/browser/content_settings/host_content_settings_map.h" |
21 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" | 20 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" |
22 #include "chrome/browser/download/download_service.h" | 21 #include "chrome/browser/download/download_service.h" |
23 #include "chrome/browser/download/download_service_factory.h" | 22 #include "chrome/browser/download/download_service_factory.h" |
24 #include "chrome/browser/extensions/extension_info_map.h" | 23 #include "chrome/browser/extensions/extension_info_map.h" |
25 #include "chrome/browser/extensions/extension_protocols.h" | 24 #include "chrome/browser/extensions/extension_protocols.h" |
26 #include "chrome/browser/io_thread.h" | 25 #include "chrome/browser/io_thread.h" |
27 #include "chrome/browser/media/media_internals.h" | 26 #include "chrome/browser/media/media_internals.h" |
(...skipping 520 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
548 #if defined(ENABLE_CONFIGURATION_POLICY) | 547 #if defined(ENABLE_CONFIGURATION_POLICY) |
549 if (url_blacklist_manager_.get()) | 548 if (url_blacklist_manager_.get()) |
550 url_blacklist_manager_->ShutdownOnUIThread(); | 549 url_blacklist_manager_->ShutdownOnUIThread(); |
551 #endif | 550 #endif |
552 BrowserThread::PostTask( | 551 BrowserThread::PostTask( |
553 BrowserThread::IO, FROM_HERE, | 552 BrowserThread::IO, FROM_HERE, |
554 base::Bind( | 553 base::Bind( |
555 &ResourceDispatcherHost::CancelRequestsForContext, | 554 &ResourceDispatcherHost::CancelRequestsForContext, |
556 base::Unretained(g_browser_process->resource_dispatcher_host()), | 555 base::Unretained(g_browser_process->resource_dispatcher_host()), |
557 &resource_context_)); | 556 &resource_context_)); |
558 bool posted = BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, | 557 bool posted = BrowserThread::DeleteSoon(BrowserThread::IO, FROM_HERE, this); |
559 new DeleteTask<ProfileIOData>(this)); | |
560 if (!posted) | 558 if (!posted) |
561 delete this; | 559 delete this; |
562 } | 560 } |
563 | 561 |
564 void ProfileIOData::set_origin_bound_cert_service( | 562 void ProfileIOData::set_origin_bound_cert_service( |
565 net::OriginBoundCertService* origin_bound_cert_service) const { | 563 net::OriginBoundCertService* origin_bound_cert_service) const { |
566 origin_bound_cert_service_.reset(origin_bound_cert_service); | 564 origin_bound_cert_service_.reset(origin_bound_cert_service); |
567 } | 565 } |
OLD | NEW |