| 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 <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/callback.h" | 10 #include "base/callback.h" |
| (...skipping 1226 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1237 PrefProxyConfigTracker* ProfileImpl::GetProxyConfigTracker() { | 1237 PrefProxyConfigTracker* ProfileImpl::GetProxyConfigTracker() { |
| 1238 if (!pref_proxy_config_tracker_) | 1238 if (!pref_proxy_config_tracker_) |
| 1239 pref_proxy_config_tracker_.reset(CreateProxyConfigTracker()); | 1239 pref_proxy_config_tracker_.reset(CreateProxyConfigTracker()); |
| 1240 return pref_proxy_config_tracker_.get(); | 1240 return pref_proxy_config_tracker_.get(); |
| 1241 } | 1241 } |
| 1242 | 1242 |
| 1243 chrome_browser_net::Predictor* ProfileImpl::GetNetworkPredictor() { | 1243 chrome_browser_net::Predictor* ProfileImpl::GetNetworkPredictor() { |
| 1244 return predictor_; | 1244 return predictor_; |
| 1245 } | 1245 } |
| 1246 | 1246 |
| 1247 void ProfileImpl::ClearNetworkingHistorySince(base::Time time, | 1247 void ProfileImpl::ClearNetworkingHistorySince( |
| 1248 const base::Closure& completion) { | 1248 base::Time time, |
| 1249 const base::Closure& completion) { |
| 1249 io_data_.ClearNetworkingHistorySince(time, completion); | 1250 io_data_.ClearNetworkingHistorySince(time, completion); |
| 1250 } | 1251 } |
| 1251 | 1252 |
| 1253 void ProfileImpl::ClearDomainReliabilityMonitor( |
| 1254 domain_reliability::DomainReliabilityClearMode mode, |
| 1255 const base::Closure& completion) { |
| 1256 io_data_.ClearDomainReliabilityMonitor(mode, completion); |
| 1257 } |
| 1258 |
| 1252 GURL ProfileImpl::GetHomePage() { | 1259 GURL ProfileImpl::GetHomePage() { |
| 1253 // --homepage overrides any preferences. | 1260 // --homepage overrides any preferences. |
| 1254 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); | 1261 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); |
| 1255 if (command_line.HasSwitch(switches::kHomePage)) { | 1262 if (command_line.HasSwitch(switches::kHomePage)) { |
| 1256 // TODO(evanm): clean up usage of DIR_CURRENT. | 1263 // TODO(evanm): clean up usage of DIR_CURRENT. |
| 1257 // http://code.google.com/p/chromium/issues/detail?id=60630 | 1264 // http://code.google.com/p/chromium/issues/detail?id=60630 |
| 1258 // For now, allow this code to call getcwd(). | 1265 // For now, allow this code to call getcwd(). |
| 1259 base::ThreadRestrictions::ScopedAllowIO allow_io; | 1266 base::ThreadRestrictions::ScopedAllowIO allow_io; |
| 1260 | 1267 |
| 1261 base::FilePath browser_directory; | 1268 base::FilePath browser_directory; |
| (...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1351 PrefProxyConfigTracker* ProfileImpl::CreateProxyConfigTracker() { | 1358 PrefProxyConfigTracker* ProfileImpl::CreateProxyConfigTracker() { |
| 1352 #if defined(OS_CHROMEOS) | 1359 #if defined(OS_CHROMEOS) |
| 1353 if (chromeos::ProfileHelper::IsSigninProfile(this)) { | 1360 if (chromeos::ProfileHelper::IsSigninProfile(this)) { |
| 1354 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( | 1361 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( |
| 1355 g_browser_process->local_state()); | 1362 g_browser_process->local_state()); |
| 1356 } | 1363 } |
| 1357 #endif // defined(OS_CHROMEOS) | 1364 #endif // defined(OS_CHROMEOS) |
| 1358 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( | 1365 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( |
| 1359 GetPrefs(), g_browser_process->local_state()); | 1366 GetPrefs(), g_browser_process->local_state()); |
| 1360 } | 1367 } |
| OLD | NEW |