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

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

Issue 10917182: Disable TLS channel id if cookies are disabled or third-party cookies are blocked. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix win build warning Created 8 years, 3 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 "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/environment.h" 10 #include "base/environment.h"
(...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after
339 339
340 #if !defined(OS_CHROMEOS) 340 #if !defined(OS_CHROMEOS)
341 // Listen for bookmark model load, to bootstrap the sync service. 341 // Listen for bookmark model load, to bootstrap the sync service.
342 // On CrOS sync service will be initialized after sign in. 342 // On CrOS sync service will be initialized after sign in.
343 registrar_.Add(this, chrome::NOTIFICATION_BOOKMARK_MODEL_LOADED, 343 registrar_.Add(this, chrome::NOTIFICATION_BOOKMARK_MODEL_LOADED,
344 content::Source<Profile>(this)); 344 content::Source<Profile>(this));
345 #endif 345 #endif
346 346
347 PrefService* local_state = g_browser_process->local_state(); 347 PrefService* local_state = g_browser_process->local_state();
348 ssl_config_service_manager_.reset( 348 ssl_config_service_manager_.reset(
349 SSLConfigServiceManager::CreateDefaultManager(local_state)); 349 SSLConfigServiceManager::CreateDefaultManager(local_state, prefs));
350 350
351 // Initialize the BackgroundModeManager - this has to be done here before 351 // Initialize the BackgroundModeManager - this has to be done here before
352 // InitExtensions() is called because it relies on receiving notifications 352 // InitExtensions() is called because it relies on receiving notifications
353 // when extensions are loaded. BackgroundModeManager is not needed under 353 // when extensions are loaded. BackgroundModeManager is not needed under
354 // ChromeOS because Chrome is always running, no need for special keep-alive 354 // ChromeOS because Chrome is always running, no need for special keep-alive
355 // or launch-on-startup support unless kKeepAliveForTest is set. 355 // or launch-on-startup support unless kKeepAliveForTest is set.
356 bool init_background_mode_manager = true; 356 bool init_background_mode_manager = true;
357 #if defined(OS_CHROMEOS) 357 #if defined(OS_CHROMEOS)
358 if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kKeepAliveForTest)) 358 if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kKeepAliveForTest))
359 init_background_mode_manager = false; 359 init_background_mode_manager = false;
(...skipping 732 matching lines...) Expand 10 before | Expand all | Expand 10 after
1092 if (!path.empty()) 1092 if (!path.empty())
1093 *cache_path = path; 1093 *cache_path = path;
1094 *max_size = is_media_context ? prefs_->GetInteger(prefs::kMediaCacheSize) : 1094 *max_size = is_media_context ? prefs_->GetInteger(prefs::kMediaCacheSize) :
1095 prefs_->GetInteger(prefs::kDiskCacheSize); 1095 prefs_->GetInteger(prefs::kDiskCacheSize);
1096 } 1096 }
1097 1097
1098 base::Callback<ChromeURLDataManagerBackend*(void)> 1098 base::Callback<ChromeURLDataManagerBackend*(void)>
1099 ProfileImpl::GetChromeURLDataManagerBackendGetter() const { 1099 ProfileImpl::GetChromeURLDataManagerBackendGetter() const {
1100 return io_data_.GetChromeURLDataManagerBackendGetter(); 1100 return io_data_.GetChromeURLDataManagerBackendGetter();
1101 } 1101 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698