| 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 835 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 846 predictor_)); | 846 predictor_)); |
| 847 } | 847 } |
| 848 | 848 |
| 849 SchedulePrefsFileVerification(GetPrefFilePath()); | 849 SchedulePrefsFileVerification(GetPrefFilePath()); |
| 850 | 850 |
| 851 ChromeVersionService::OnProfileLoaded(prefs_.get(), IsNewProfile()); | 851 ChromeVersionService::OnProfileLoaded(prefs_.get(), IsNewProfile()); |
| 852 DoFinalInit(); | 852 DoFinalInit(); |
| 853 } | 853 } |
| 854 | 854 |
| 855 bool ProfileImpl::WasCreatedByVersionOrLater(const std::string& version) { | 855 bool ProfileImpl::WasCreatedByVersionOrLater(const std::string& version) { |
| 856 base::Version profile_version(ChromeVersionService::GetVersion(prefs_.get())); | 856 Version profile_version(ChromeVersionService::GetVersion(prefs_.get())); |
| 857 base::Version arg_version(version); | 857 Version arg_version(version); |
| 858 return (profile_version.CompareTo(arg_version) >= 0); | 858 return (profile_version.CompareTo(arg_version) >= 0); |
| 859 } | 859 } |
| 860 | 860 |
| 861 void ProfileImpl::SetExitType(ExitType exit_type) { | 861 void ProfileImpl::SetExitType(ExitType exit_type) { |
| 862 #if defined(OS_CHROMEOS) | 862 #if defined(OS_CHROMEOS) |
| 863 if (chromeos::ProfileHelper::IsSigninProfile(this)) | 863 if (chromeos::ProfileHelper::IsSigninProfile(this)) |
| 864 return; | 864 return; |
| 865 #endif | 865 #endif |
| 866 if (!prefs_) | 866 if (!prefs_) |
| 867 return; | 867 return; |
| (...skipping 415 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1283 PrefProxyConfigTracker* ProfileImpl::CreateProxyConfigTracker() { | 1283 PrefProxyConfigTracker* ProfileImpl::CreateProxyConfigTracker() { |
| 1284 #if defined(OS_CHROMEOS) | 1284 #if defined(OS_CHROMEOS) |
| 1285 if (chromeos::ProfileHelper::IsSigninProfile(this)) { | 1285 if (chromeos::ProfileHelper::IsSigninProfile(this)) { |
| 1286 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( | 1286 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( |
| 1287 g_browser_process->local_state()); | 1287 g_browser_process->local_state()); |
| 1288 } | 1288 } |
| 1289 #endif // defined(OS_CHROMEOS) | 1289 #endif // defined(OS_CHROMEOS) |
| 1290 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( | 1290 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( |
| 1291 GetPrefs(), g_browser_process->local_state()); | 1291 GetPrefs(), g_browser_process->local_state()); |
| 1292 } | 1292 } |
| OLD | NEW |