| 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 737 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 748 last_session_exit_type_ = | 748 last_session_exit_type_ = |
| 749 SessionTypePrefValueToExitType(exit_type_pref_value); | 749 SessionTypePrefValueToExitType(exit_type_pref_value); |
| 750 } | 750 } |
| 751 // Mark the session as open. | 751 // Mark the session as open. |
| 752 prefs_->SetString(prefs::kSessionExitType, kPrefExitTypeCrashed); | 752 prefs_->SetString(prefs::kSessionExitType, kPrefExitTypeCrashed); |
| 753 // Force this to true in case we fallback and use it. | 753 // Force this to true in case we fallback and use it. |
| 754 // TODO(sky): remove this in a couple of releases (m28ish). | 754 // TODO(sky): remove this in a couple of releases (m28ish). |
| 755 prefs_->SetBoolean(prefs::kSessionExitedCleanly, true); | 755 prefs_->SetBoolean(prefs::kSessionExitedCleanly, true); |
| 756 | 756 |
| 757 BrowserContextDependencyManager::GetInstance()->CreateBrowserContextServices( | 757 BrowserContextDependencyManager::GetInstance()->CreateBrowserContextServices( |
| 758 this, false); | 758 this); |
| 759 | 759 |
| 760 DCHECK(!net_pref_observer_); | 760 DCHECK(!net_pref_observer_); |
| 761 { | 761 { |
| 762 TRACE_EVENT0("browser", "ProfileImpl::OnPrefsLoaded:NetPrefObserver") | 762 TRACE_EVENT0("browser", "ProfileImpl::OnPrefsLoaded:NetPrefObserver") |
| 763 net_pref_observer_.reset(new NetPrefObserver( | 763 net_pref_observer_.reset(new NetPrefObserver( |
| 764 prefs_.get(), | 764 prefs_.get(), |
| 765 prerender::PrerenderManagerFactory::GetForProfile(this), | 765 prerender::PrerenderManagerFactory::GetForProfile(this), |
| 766 predictor_)); | 766 predictor_)); |
| 767 } | 767 } |
| 768 | 768 |
| (...skipping 404 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1173 PrefProxyConfigTracker* ProfileImpl::CreateProxyConfigTracker() { | 1173 PrefProxyConfigTracker* ProfileImpl::CreateProxyConfigTracker() { |
| 1174 #if defined(OS_CHROMEOS) | 1174 #if defined(OS_CHROMEOS) |
| 1175 if (chromeos::ProfileHelper::IsSigninProfile(this)) { | 1175 if (chromeos::ProfileHelper::IsSigninProfile(this)) { |
| 1176 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( | 1176 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( |
| 1177 g_browser_process->local_state()); | 1177 g_browser_process->local_state()); |
| 1178 } | 1178 } |
| 1179 #endif // defined(OS_CHROMEOS) | 1179 #endif // defined(OS_CHROMEOS) |
| 1180 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( | 1180 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( |
| 1181 GetPrefs(), g_browser_process->local_state()); | 1181 GetPrefs(), g_browser_process->local_state()); |
| 1182 } | 1182 } |
| OLD | NEW |