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

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

Issue 1232553003: Add new certificateProvider extension API. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
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_io_data.h" 5 #include "chrome/browser/profiles/profile_io_data.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 903 matching lines...) Expand 10 before | Expand all | Expand 10 after
914 DCHECK(io_data_->initialized_); 914 DCHECK(io_data_->initialized_);
915 return request_context_; 915 return request_context_;
916 } 916 }
917 917
918 scoped_ptr<net::ClientCertStore> 918 scoped_ptr<net::ClientCertStore>
919 ProfileIOData::ResourceContext::CreateClientCertStore() { 919 ProfileIOData::ResourceContext::CreateClientCertStore() {
920 if (!io_data_->client_cert_store_factory_.is_null()) 920 if (!io_data_->client_cert_store_factory_.is_null())
921 return io_data_->client_cert_store_factory_.Run(); 921 return io_data_->client_cert_store_factory_.Run();
922 #if defined(OS_CHROMEOS) 922 #if defined(OS_CHROMEOS)
923 return scoped_ptr<net::ClientCertStore>(new net::ClientCertStoreChromeOS( 923 return scoped_ptr<net::ClientCertStore>(new net::ClientCertStoreChromeOS(
924 nullptr,
924 make_scoped_ptr(new chromeos::ClientCertFilterChromeOS( 925 make_scoped_ptr(new chromeos::ClientCertFilterChromeOS(
925 io_data_->use_system_key_slot(), io_data_->username_hash())), 926 io_data_->use_system_key_slot(), io_data_->username_hash())),
926 base::Bind(&CreateCryptoModuleBlockingPasswordDelegate, 927 base::Bind(&CreateCryptoModuleBlockingPasswordDelegate,
927 chrome::kCryptoModulePasswordClientAuth))); 928 chrome::kCryptoModulePasswordClientAuth)));
928 #elif defined(USE_NSS_CERTS) 929 #elif defined(USE_NSS_CERTS)
929 return scoped_ptr<net::ClientCertStore>(new net::ClientCertStoreNSS( 930 return scoped_ptr<net::ClientCertStore>(new net::ClientCertStoreNSS(
930 base::Bind(&CreateCryptoModuleBlockingPasswordDelegate, 931 base::Bind(&CreateCryptoModuleBlockingPasswordDelegate,
931 chrome::kCryptoModulePasswordClientAuth))); 932 chrome::kCryptoModulePasswordClientAuth)));
932 #elif defined(OS_WIN) 933 #elif defined(OS_WIN)
933 return scoped_ptr<net::ClientCertStore>(new net::ClientCertStoreWin()); 934 return scoped_ptr<net::ClientCertStore>(new net::ClientCertStoreWin());
(...skipping 363 matching lines...) Expand 10 before | Expand all | Expand 10 after
1297 new DevToolsNetworkTransactionFactory( 1298 new DevToolsNetworkTransactionFactory(
1298 network_controller_.get(), shared_session), 1299 network_controller_.get(), shared_session),
1299 shared_session->net_log(), backend)); 1300 shared_session->net_log(), backend));
1300 } 1301 }
1301 1302
1302 void ProfileIOData::SetCookieSettingsForTesting( 1303 void ProfileIOData::SetCookieSettingsForTesting(
1303 content_settings::CookieSettings* cookie_settings) { 1304 content_settings::CookieSettings* cookie_settings) {
1304 DCHECK(!cookie_settings_.get()); 1305 DCHECK(!cookie_settings_.get());
1305 cookie_settings_ = cookie_settings; 1306 cookie_settings_ = cookie_settings;
1306 } 1307 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698