| 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 802 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 813 predictor_)); | 813 predictor_)); |
| 814 } | 814 } |
| 815 | 815 |
| 816 SchedulePrefsFileVerification(GetPrefFilePath()); | 816 SchedulePrefsFileVerification(GetPrefFilePath()); |
| 817 | 817 |
| 818 ChromeVersionService::OnProfileLoaded(prefs_.get(), IsNewProfile()); | 818 ChromeVersionService::OnProfileLoaded(prefs_.get(), IsNewProfile()); |
| 819 DoFinalInit(); | 819 DoFinalInit(); |
| 820 } | 820 } |
| 821 | 821 |
| 822 bool ProfileImpl::WasCreatedByVersionOrLater(const std::string& version) { | 822 bool ProfileImpl::WasCreatedByVersionOrLater(const std::string& version) { |
| 823 Version profile_version(ChromeVersionService::GetVersion(prefs_.get())); | 823 base::Version profile_version(ChromeVersionService::GetVersion(prefs_.get())); |
| 824 Version arg_version(version); | 824 base::Version arg_version(version); |
| 825 return (profile_version.CompareTo(arg_version) >= 0); | 825 return (profile_version.CompareTo(arg_version) >= 0); |
| 826 } | 826 } |
| 827 | 827 |
| 828 void ProfileImpl::SetExitType(ExitType exit_type) { | 828 void ProfileImpl::SetExitType(ExitType exit_type) { |
| 829 #if defined(OS_CHROMEOS) | 829 #if defined(OS_CHROMEOS) |
| 830 if (chromeos::ProfileHelper::IsSigninProfile(this)) | 830 if (chromeos::ProfileHelper::IsSigninProfile(this)) |
| 831 return; | 831 return; |
| 832 #endif | 832 #endif |
| 833 if (!prefs_) | 833 if (!prefs_) |
| 834 return; | 834 return; |
| (...skipping 415 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1250 PrefProxyConfigTracker* ProfileImpl::CreateProxyConfigTracker() { | 1250 PrefProxyConfigTracker* ProfileImpl::CreateProxyConfigTracker() { |
| 1251 #if defined(OS_CHROMEOS) | 1251 #if defined(OS_CHROMEOS) |
| 1252 if (chromeos::ProfileHelper::IsSigninProfile(this)) { | 1252 if (chromeos::ProfileHelper::IsSigninProfile(this)) { |
| 1253 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( | 1253 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( |
| 1254 g_browser_process->local_state()); | 1254 g_browser_process->local_state()); |
| 1255 } | 1255 } |
| 1256 #endif // defined(OS_CHROMEOS) | 1256 #endif // defined(OS_CHROMEOS) |
| 1257 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( | 1257 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( |
| 1258 GetPrefs(), g_browser_process->local_state()); | 1258 GetPrefs(), g_browser_process->local_state()); |
| 1259 } | 1259 } |
| OLD | NEW |