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