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 577 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
588 PluginPrefs::GetForProfile(this).get(), | 588 PluginPrefs::GetForProfile(this).get(), |
589 io_data_.GetResourceContextNoInit()); | 589 io_data_.GetResourceContextNoInit()); |
590 #endif | 590 #endif |
591 | 591 |
592 // Delay README creation to not impact startup performance. | 592 // Delay README creation to not impact startup performance. |
593 BrowserThread::PostDelayedTask( | 593 BrowserThread::PostDelayedTask( |
594 BrowserThread::FILE, FROM_HERE, | 594 BrowserThread::FILE, FROM_HERE, |
595 base::Bind(&EnsureReadmeFile, GetPath()), | 595 base::Bind(&EnsureReadmeFile, GetPath()), |
596 base::TimeDelta::FromMilliseconds(create_readme_delay_ms)); | 596 base::TimeDelta::FromMilliseconds(create_readme_delay_ms)); |
597 | 597 |
598 if (!CommandLine::ForCurrentProcess()->HasSwitch( | 598 TRACE_EVENT0("browser", "ProfileImpl::SetSaveSessionStorageOnDisk"); |
599 switches::kDisableRestoreSessionState)) { | 599 content::BrowserContext::GetDefaultStoragePartition(this)-> |
600 TRACE_EVENT0("browser", "ProfileImpl::SetSaveSessionStorageOnDisk") | 600 GetDOMStorageContext()->SetSaveSessionStorageOnDisk(); |
601 content::BrowserContext::GetDefaultStoragePartition(this)-> | |
602 GetDOMStorageContext()->SetSaveSessionStorageOnDisk(); | |
603 } | |
604 | 601 |
605 // Creation has been finished. | 602 // Creation has been finished. |
606 if (delegate_) { | 603 if (delegate_) { |
607 TRACE_EVENT0("browser", "ProfileImpl::DoFileInit:DelegateOnProfileCreated") | 604 TRACE_EVENT0("browser", "ProfileImpl::DoFileInit:DelegateOnProfileCreated") |
608 delegate_->OnProfileCreated(this, true, IsNewProfile()); | 605 delegate_->OnProfileCreated(this, true, IsNewProfile()); |
609 } | 606 } |
610 | 607 |
611 content::NotificationService::current()->Notify( | 608 content::NotificationService::current()->Notify( |
612 chrome::NOTIFICATION_PROFILE_CREATED, | 609 chrome::NOTIFICATION_PROFILE_CREATED, |
613 content::Source<Profile>(this), | 610 content::Source<Profile>(this), |
(...skipping 655 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1269 PrefProxyConfigTracker* ProfileImpl::CreateProxyConfigTracker() { | 1266 PrefProxyConfigTracker* ProfileImpl::CreateProxyConfigTracker() { |
1270 #if defined(OS_CHROMEOS) | 1267 #if defined(OS_CHROMEOS) |
1271 if (chromeos::ProfileHelper::IsSigninProfile(this)) { | 1268 if (chromeos::ProfileHelper::IsSigninProfile(this)) { |
1272 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( | 1269 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( |
1273 g_browser_process->local_state()); | 1270 g_browser_process->local_state()); |
1274 } | 1271 } |
1275 #endif // defined(OS_CHROMEOS) | 1272 #endif // defined(OS_CHROMEOS) |
1276 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( | 1273 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( |
1277 GetPrefs(), g_browser_process->local_state()); | 1274 GetPrefs(), g_browser_process->local_state()); |
1278 } | 1275 } |
OLD | NEW |