| 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 865 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 876 ExitType current_exit_type = SessionTypePrefValueToExitType( | 876 ExitType current_exit_type = SessionTypePrefValueToExitType( |
| 877 prefs_->GetString(prefs::kSessionExitType)); | 877 prefs_->GetString(prefs::kSessionExitType)); |
| 878 // This may be invoked multiple times during shutdown. Only persist the value | 878 // This may be invoked multiple times during shutdown. Only persist the value |
| 879 // first passed in (unless it's a reset to the crash state, which happens when | 879 // first passed in (unless it's a reset to the crash state, which happens when |
| 880 // foregrounding the app on mobile). | 880 // foregrounding the app on mobile). |
| 881 if (exit_type == EXIT_CRASHED || current_exit_type == EXIT_CRASHED) { | 881 if (exit_type == EXIT_CRASHED || current_exit_type == EXIT_CRASHED) { |
| 882 prefs_->SetString(prefs::kSessionExitType, | 882 prefs_->SetString(prefs::kSessionExitType, |
| 883 ExitTypeToSessionTypePrefValue(exit_type)); | 883 ExitTypeToSessionTypePrefValue(exit_type)); |
| 884 | 884 |
| 885 // NOTE: If you change what thread this writes on, be sure and update | 885 // NOTE: If you change what thread this writes on, be sure and update |
| 886 // ChromeFrame::EndSession(). | 886 // chrome::SessionEnding(). |
| 887 prefs_->CommitPendingWrite(); | 887 prefs_->CommitPendingWrite(); |
| 888 } | 888 } |
| 889 } | 889 } |
| 890 | 890 |
| 891 Profile::ExitType ProfileImpl::GetLastSessionExitType() { | 891 Profile::ExitType ProfileImpl::GetLastSessionExitType() { |
| 892 // last_session_exited_cleanly_ is set when the preferences are loaded. Force | 892 // last_session_exited_cleanly_ is set when the preferences are loaded. Force |
| 893 // it to be set by asking for the prefs. | 893 // it to be set by asking for the prefs. |
| 894 GetPrefs(); | 894 GetPrefs(); |
| 895 return last_session_exit_type_; | 895 return last_session_exit_type_; |
| 896 } | 896 } |
| (...skipping 427 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1324 PrefProxyConfigTracker* ProfileImpl::CreateProxyConfigTracker() { | 1324 PrefProxyConfigTracker* ProfileImpl::CreateProxyConfigTracker() { |
| 1325 #if defined(OS_CHROMEOS) | 1325 #if defined(OS_CHROMEOS) |
| 1326 if (chromeos::ProfileHelper::IsSigninProfile(this)) { | 1326 if (chromeos::ProfileHelper::IsSigninProfile(this)) { |
| 1327 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( | 1327 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( |
| 1328 g_browser_process->local_state()); | 1328 g_browser_process->local_state()); |
| 1329 } | 1329 } |
| 1330 #endif // defined(OS_CHROMEOS) | 1330 #endif // defined(OS_CHROMEOS) |
| 1331 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( | 1331 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( |
| 1332 GetPrefs(), g_browser_process->local_state()); | 1332 GetPrefs(), g_browser_process->local_state()); |
| 1333 } | 1333 } |
| OLD | NEW |