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 <vector> | 7 #include <vector> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/callback.h" | 10 #include "base/callback.h" |
(...skipping 546 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
557 if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kKeepAliveForTest)) | 557 if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kKeepAliveForTest)) |
558 init_background_mode_manager = false; | 558 init_background_mode_manager = false; |
559 #endif | 559 #endif |
560 if (init_background_mode_manager) { | 560 if (init_background_mode_manager) { |
561 if (g_browser_process->background_mode_manager()) | 561 if (g_browser_process->background_mode_manager()) |
562 g_browser_process->background_mode_manager()->RegisterProfile(this); | 562 g_browser_process->background_mode_manager()->RegisterProfile(this); |
563 } | 563 } |
564 | 564 |
565 base::FilePath cookie_path = GetPath(); | 565 base::FilePath cookie_path = GetPath(); |
566 cookie_path = cookie_path.Append(chrome::kCookieFilename); | 566 cookie_path = cookie_path.Append(chrome::kCookieFilename); |
567 base::FilePath server_bound_cert_path = GetPath(); | 567 base::FilePath channel_id_path = GetPath(); |
568 server_bound_cert_path = | 568 channel_id_path = |
569 server_bound_cert_path.Append(chrome::kOBCertFilename); | 569 channel_id_path.Append(chrome::kOBCertFilename); |
wtc
2014/07/01 19:50:51
1. This should fit on the previous line now.
2. R
Ryan Hamilton
2014/07/21 19:12:07
Done.
| |
570 base::FilePath cache_path = base_cache_path_; | 570 base::FilePath cache_path = base_cache_path_; |
571 int cache_max_size; | 571 int cache_max_size; |
572 GetCacheParameters(false, &cache_path, &cache_max_size); | 572 GetCacheParameters(false, &cache_path, &cache_max_size); |
573 cache_path = GetCachePath(cache_path); | 573 cache_path = GetCachePath(cache_path); |
574 | 574 |
575 base::FilePath media_cache_path = base_cache_path_; | 575 base::FilePath media_cache_path = base_cache_path_; |
576 int media_cache_max_size; | 576 int media_cache_max_size; |
577 GetCacheParameters(true, &media_cache_path, &media_cache_max_size); | 577 GetCacheParameters(true, &media_cache_path, &media_cache_max_size); |
578 media_cache_path = GetMediaCachePath(media_cache_path); | 578 media_cache_path = GetMediaCachePath(media_cache_path); |
579 | 579 |
(...skipping 18 matching lines...) Expand all Loading... | |
598 if (GetLastSessionExitType() == Profile::EXIT_CRASHED || | 598 if (GetLastSessionExitType() == Profile::EXIT_CRASHED || |
599 startup_pref_type == SessionStartupPref::LAST) { | 599 startup_pref_type == SessionStartupPref::LAST) { |
600 session_cookie_mode = content::CookieStoreConfig::RESTORED_SESSION_COOKIES; | 600 session_cookie_mode = content::CookieStoreConfig::RESTORED_SESSION_COOKIES; |
601 } | 601 } |
602 | 602 |
603 InitHostZoomMap(); | 603 InitHostZoomMap(); |
604 | 604 |
605 // Make sure we initialize the ProfileIOData after everything else has been | 605 // Make sure we initialize the ProfileIOData after everything else has been |
606 // initialized that we might be reading from the IO thread. | 606 // initialized that we might be reading from the IO thread. |
607 | 607 |
608 io_data_.Init(cookie_path, server_bound_cert_path, cache_path, | 608 io_data_.Init(cookie_path, channel_id_path, cache_path, |
609 cache_max_size, media_cache_path, media_cache_max_size, | 609 cache_max_size, media_cache_path, media_cache_max_size, |
610 extensions_cookie_path, GetPath(), infinite_cache_path, | 610 extensions_cookie_path, GetPath(), infinite_cache_path, |
611 predictor_, session_cookie_mode, GetSpecialStoragePolicy(), | 611 predictor_, session_cookie_mode, GetSpecialStoragePolicy(), |
612 CreateDomainReliabilityMonitor()); | 612 CreateDomainReliabilityMonitor()); |
613 | 613 |
614 #if defined(ENABLE_PLUGINS) | 614 #if defined(ENABLE_PLUGINS) |
615 ChromePluginServiceFilter::GetInstance()->RegisterResourceContext( | 615 ChromePluginServiceFilter::GetInstance()->RegisterResourceContext( |
616 PluginPrefs::GetForProfile(this).get(), | 616 PluginPrefs::GetForProfile(this).get(), |
617 io_data_.GetResourceContextNoInit()); | 617 io_data_.GetResourceContextNoInit()); |
618 #endif | 618 #endif |
(...skipping 707 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1326 ProfileImpl::CreateDomainReliabilityMonitor() { | 1326 ProfileImpl::CreateDomainReliabilityMonitor() { |
1327 domain_reliability::DomainReliabilityService* service = | 1327 domain_reliability::DomainReliabilityService* service = |
1328 domain_reliability::DomainReliabilityServiceFactory::GetInstance()-> | 1328 domain_reliability::DomainReliabilityServiceFactory::GetInstance()-> |
1329 GetForBrowserContext(this); | 1329 GetForBrowserContext(this); |
1330 if (!service) | 1330 if (!service) |
1331 return scoped_ptr<domain_reliability::DomainReliabilityMonitor>(); | 1331 return scoped_ptr<domain_reliability::DomainReliabilityMonitor>(); |
1332 | 1332 |
1333 return service->CreateMonitor( | 1333 return service->CreateMonitor( |
1334 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)); | 1334 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)); |
1335 } | 1335 } |
OLD | NEW |