| 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_impl.h" | 5 #include "chrome/browser/profiles/profile_impl.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
| 9 #include "base/environment.h" | 9 #include "base/environment.h" |
| 10 #include "base/file_path.h" | 10 #include "base/file_path.h" |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 99 #include "content/browser/host_zoom_map.h" | 99 #include "content/browser/host_zoom_map.h" |
| 100 #include "content/browser/in_process_webkit/webkit_context.h" | 100 #include "content/browser/in_process_webkit/webkit_context.h" |
| 101 #include "content/browser/renderer_host/render_process_host.h" | 101 #include "content/browser/renderer_host/render_process_host.h" |
| 102 #include "content/browser/speech/speech_input_manager.h" | 102 #include "content/browser/speech/speech_input_manager.h" |
| 103 #include "content/browser/ssl/ssl_host_state.h" | 103 #include "content/browser/ssl/ssl_host_state.h" |
| 104 #include "content/browser/user_metrics.h" | 104 #include "content/browser/user_metrics.h" |
| 105 #include "content/common/notification_service.h" | 105 #include "content/common/notification_service.h" |
| 106 #include "grit/browser_resources.h" | 106 #include "grit/browser_resources.h" |
| 107 #include "grit/locale_settings.h" | 107 #include "grit/locale_settings.h" |
| 108 #include "net/base/transport_security_state.h" | 108 #include "net/base/transport_security_state.h" |
| 109 #include "net/http/http_server_properties.h" |
| 109 #include "ui/base/resource/resource_bundle.h" | 110 #include "ui/base/resource/resource_bundle.h" |
| 110 #include "webkit/database/database_tracker.h" | 111 #include "webkit/database/database_tracker.h" |
| 111 #include "webkit/quota/quota_manager.h" | 112 #include "webkit/quota/quota_manager.h" |
| 112 | 113 |
| 113 #if defined(OS_WIN) | 114 #if defined(OS_WIN) |
| 114 #include "chrome/browser/instant/promo_counter.h" | 115 #include "chrome/browser/instant/promo_counter.h" |
| 115 #include "chrome/browser/password_manager/password_store_win.h" | 116 #include "chrome/browser/password_manager/password_store_win.h" |
| 116 #include "chrome/installer/util/install_util.h" | 117 #include "chrome/installer/util/install_util.h" |
| 117 #elif defined(OS_MACOSX) | 118 #elif defined(OS_MACOSX) |
| 118 #include "chrome/browser/keychain_mac.h" | 119 #include "chrome/browser/keychain_mac.h" |
| (...skipping 1626 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1745 if (!pref_proxy_config_tracker_) | 1746 if (!pref_proxy_config_tracker_) |
| 1746 pref_proxy_config_tracker_ = new PrefProxyConfigTracker(GetPrefs()); | 1747 pref_proxy_config_tracker_ = new PrefProxyConfigTracker(GetPrefs()); |
| 1747 | 1748 |
| 1748 return pref_proxy_config_tracker_; | 1749 return pref_proxy_config_tracker_; |
| 1749 } | 1750 } |
| 1750 | 1751 |
| 1751 chrome_browser_net::Predictor* ProfileImpl::GetNetworkPredictor() { | 1752 chrome_browser_net::Predictor* ProfileImpl::GetNetworkPredictor() { |
| 1752 return predictor_; | 1753 return predictor_; |
| 1753 } | 1754 } |
| 1754 | 1755 |
| 1755 void ProfileImpl::DeleteTransportSecurityStateSince(base::Time time) { | 1756 void ProfileImpl::ClearNetworkingHistorySince(base::Time time) { |
| 1756 io_data_.DeleteTransportSecurityStateSince(time); | 1757 io_data_.ClearNetworkingHistorySince(time); |
| 1757 } | 1758 } |
| 1758 | 1759 |
| 1759 SpellCheckProfile* ProfileImpl::GetSpellCheckProfile() { | 1760 SpellCheckProfile* ProfileImpl::GetSpellCheckProfile() { |
| 1760 if (!spellcheck_profile_.get()) | 1761 if (!spellcheck_profile_.get()) |
| 1761 spellcheck_profile_.reset(new SpellCheckProfile()); | 1762 spellcheck_profile_.reset(new SpellCheckProfile()); |
| 1762 return spellcheck_profile_.get(); | 1763 return spellcheck_profile_.get(); |
| 1763 } | 1764 } |
| 1764 | 1765 |
| 1765 void ProfileImpl::SetDownloadManagerDelegate( | 1766 void ProfileImpl::SetDownloadManagerDelegate( |
| 1766 ChromeDownloadManagerDelegate* delegate) { | 1767 ChromeDownloadManagerDelegate* delegate) { |
| 1767 download_manager_delegate_ = delegate; | 1768 download_manager_delegate_ = delegate; |
| 1768 } | 1769 } |
| OLD | NEW |