| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/callback.h" | 8 #include "base/callback.h" |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
| (...skipping 1189 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1200 PrefProxyConfigTracker* ProfileImpl::GetProxyConfigTracker() { | 1200 PrefProxyConfigTracker* ProfileImpl::GetProxyConfigTracker() { |
| 1201 if (!pref_proxy_config_tracker_) | 1201 if (!pref_proxy_config_tracker_) |
| 1202 pref_proxy_config_tracker_.reset(CreateProxyConfigTracker()); | 1202 pref_proxy_config_tracker_.reset(CreateProxyConfigTracker()); |
| 1203 return pref_proxy_config_tracker_.get(); | 1203 return pref_proxy_config_tracker_.get(); |
| 1204 } | 1204 } |
| 1205 | 1205 |
| 1206 chrome_browser_net::Predictor* ProfileImpl::GetNetworkPredictor() { | 1206 chrome_browser_net::Predictor* ProfileImpl::GetNetworkPredictor() { |
| 1207 return predictor_; | 1207 return predictor_; |
| 1208 } | 1208 } |
| 1209 | 1209 |
| 1210 void ProfileImpl::ClearNetworkingHistorySince(base::Time time, | 1210 void ProfileImpl::ClearNetworkingHistorySince( |
| 1211 const base::Closure& completion) { | 1211 base::Time time, |
| 1212 const base::Closure& completion) { |
| 1212 io_data_.ClearNetworkingHistorySince(time, completion); | 1213 io_data_.ClearNetworkingHistorySince(time, completion); |
| 1213 } | 1214 } |
| 1214 | 1215 |
| 1216 void ProfileImpl::ClearDomainReliabilityMonitor( |
| 1217 bool clear_contexts, |
| 1218 const base::Closure& completion) { |
| 1219 io_data_.ClearDomainReliabilityMonitor(clear_contexts, completion); |
| 1220 } |
| 1221 |
| 1215 GURL ProfileImpl::GetHomePage() { | 1222 GURL ProfileImpl::GetHomePage() { |
| 1216 // --homepage overrides any preferences. | 1223 // --homepage overrides any preferences. |
| 1217 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); | 1224 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); |
| 1218 if (command_line.HasSwitch(switches::kHomePage)) { | 1225 if (command_line.HasSwitch(switches::kHomePage)) { |
| 1219 // TODO(evanm): clean up usage of DIR_CURRENT. | 1226 // TODO(evanm): clean up usage of DIR_CURRENT. |
| 1220 // http://code.google.com/p/chromium/issues/detail?id=60630 | 1227 // http://code.google.com/p/chromium/issues/detail?id=60630 |
| 1221 // For now, allow this code to call getcwd(). | 1228 // For now, allow this code to call getcwd(). |
| 1222 base::ThreadRestrictions::ScopedAllowIO allow_io; | 1229 base::ThreadRestrictions::ScopedAllowIO allow_io; |
| 1223 | 1230 |
| 1224 base::FilePath browser_directory; | 1231 base::FilePath browser_directory; |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1303 PrefProxyConfigTracker* ProfileImpl::CreateProxyConfigTracker() { | 1310 PrefProxyConfigTracker* ProfileImpl::CreateProxyConfigTracker() { |
| 1304 #if defined(OS_CHROMEOS) | 1311 #if defined(OS_CHROMEOS) |
| 1305 if (chromeos::ProfileHelper::IsSigninProfile(this)) { | 1312 if (chromeos::ProfileHelper::IsSigninProfile(this)) { |
| 1306 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( | 1313 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( |
| 1307 g_browser_process->local_state()); | 1314 g_browser_process->local_state()); |
| 1308 } | 1315 } |
| 1309 #endif // defined(OS_CHROMEOS) | 1316 #endif // defined(OS_CHROMEOS) |
| 1310 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( | 1317 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( |
| 1311 GetPrefs(), g_browser_process->local_state()); | 1318 GetPrefs(), g_browser_process->local_state()); |
| 1312 } | 1319 } |
| OLD | NEW |