Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(50)

Side by Side Diff: chrome/browser/profiles/profile_impl.cc

Issue 356713005: Rename ServerBoundCert => ChannelID to reflect the current name (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 543 matching lines...) Expand 10 before | Expand all | Expand 10 after
554 if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kKeepAliveForTest)) 554 if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kKeepAliveForTest))
555 init_background_mode_manager = false; 555 init_background_mode_manager = false;
556 #endif 556 #endif
557 if (init_background_mode_manager) { 557 if (init_background_mode_manager) {
558 if (g_browser_process->background_mode_manager()) 558 if (g_browser_process->background_mode_manager())
559 g_browser_process->background_mode_manager()->RegisterProfile(this); 559 g_browser_process->background_mode_manager()->RegisterProfile(this);
560 } 560 }
561 561
562 base::FilePath cookie_path = GetPath(); 562 base::FilePath cookie_path = GetPath();
563 cookie_path = cookie_path.Append(chrome::kCookieFilename); 563 cookie_path = cookie_path.Append(chrome::kCookieFilename);
564 base::FilePath server_bound_cert_path = GetPath(); 564 base::FilePath channel_id_path = GetPath();
565 server_bound_cert_path = 565 channel_id_path = channel_id_path.Append(chrome::kChannelIDFilename);
566 server_bound_cert_path.Append(chrome::kOBCertFilename);
567 base::FilePath cache_path = base_cache_path_; 566 base::FilePath cache_path = base_cache_path_;
568 int cache_max_size; 567 int cache_max_size;
569 GetCacheParameters(false, &cache_path, &cache_max_size); 568 GetCacheParameters(false, &cache_path, &cache_max_size);
570 cache_path = GetCachePath(cache_path); 569 cache_path = GetCachePath(cache_path);
571 570
572 base::FilePath media_cache_path = base_cache_path_; 571 base::FilePath media_cache_path = base_cache_path_;
573 int media_cache_max_size; 572 int media_cache_max_size;
574 GetCacheParameters(true, &media_cache_path, &media_cache_max_size); 573 GetCacheParameters(true, &media_cache_path, &media_cache_max_size);
575 media_cache_path = GetMediaCachePath(media_cache_path); 574 media_cache_path = GetMediaCachePath(media_cache_path);
576 575
(...skipping 18 matching lines...) Expand all
595 if (GetLastSessionExitType() == Profile::EXIT_CRASHED || 594 if (GetLastSessionExitType() == Profile::EXIT_CRASHED ||
596 startup_pref_type == SessionStartupPref::LAST) { 595 startup_pref_type == SessionStartupPref::LAST) {
597 session_cookie_mode = content::CookieStoreConfig::RESTORED_SESSION_COOKIES; 596 session_cookie_mode = content::CookieStoreConfig::RESTORED_SESSION_COOKIES;
598 } 597 }
599 598
600 InitHostZoomMap(); 599 InitHostZoomMap();
601 600
602 // Make sure we initialize the ProfileIOData after everything else has been 601 // Make sure we initialize the ProfileIOData after everything else has been
603 // initialized that we might be reading from the IO thread. 602 // initialized that we might be reading from the IO thread.
604 603
605 io_data_.Init(cookie_path, server_bound_cert_path, cache_path, 604 io_data_.Init(cookie_path, channel_id_path, cache_path,
606 cache_max_size, media_cache_path, media_cache_max_size, 605 cache_max_size, media_cache_path, media_cache_max_size,
607 extensions_cookie_path, GetPath(), infinite_cache_path, 606 extensions_cookie_path, GetPath(), infinite_cache_path,
608 predictor_, session_cookie_mode, GetSpecialStoragePolicy(), 607 predictor_, session_cookie_mode, GetSpecialStoragePolicy(),
609 CreateDomainReliabilityMonitor()); 608 CreateDomainReliabilityMonitor());
610 609
611 #if defined(ENABLE_PLUGINS) 610 #if defined(ENABLE_PLUGINS)
612 ChromePluginServiceFilter::GetInstance()->RegisterResourceContext( 611 ChromePluginServiceFilter::GetInstance()->RegisterResourceContext(
613 PluginPrefs::GetForProfile(this).get(), 612 PluginPrefs::GetForProfile(this).get(),
614 io_data_.GetResourceContextNoInit()); 613 io_data_.GetResourceContextNoInit());
615 #endif 614 #endif
(...skipping 707 matching lines...) Expand 10 before | Expand all | Expand 10 after
1323 ProfileImpl::CreateDomainReliabilityMonitor() { 1322 ProfileImpl::CreateDomainReliabilityMonitor() {
1324 domain_reliability::DomainReliabilityService* service = 1323 domain_reliability::DomainReliabilityService* service =
1325 domain_reliability::DomainReliabilityServiceFactory::GetInstance()-> 1324 domain_reliability::DomainReliabilityServiceFactory::GetInstance()->
1326 GetForBrowserContext(this); 1325 GetForBrowserContext(this);
1327 if (!service) 1326 if (!service)
1328 return scoped_ptr<domain_reliability::DomainReliabilityMonitor>(); 1327 return scoped_ptr<domain_reliability::DomainReliabilityMonitor>();
1329 1328
1330 return service->CreateMonitor( 1329 return service->CreateMonitor(
1331 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)); 1330 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO));
1332 } 1331 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698