| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/browser_main.h" | 5 #include "chrome/browser/browser_main.h" |
| 6 #include "chrome/browser/browser_main_win.h" | 6 #include "chrome/browser/browser_main_win.h" |
| 7 | 7 |
| 8 #include <windows.h> | 8 #include <windows.h> |
| 9 #include <shellapi.h> | 9 #include <shellapi.h> |
| 10 | 10 |
| (...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 232 } | 232 } |
| 233 } | 233 } |
| 234 | 234 |
| 235 private: | 235 private: |
| 236 virtual void InitializeSSL() { | 236 virtual void InitializeSSL() { |
| 237 // Use NSS for SSL by default. | 237 // Use NSS for SSL by default. |
| 238 // Because of a build system issue (http://crbug.com/43461), the default | 238 // Because of a build system issue (http://crbug.com/43461), the default |
| 239 // client socket factory uses SChannel (the system SSL library) for SSL by | 239 // client socket factory uses SChannel (the system SSL library) for SSL by |
| 240 // default on Windows. | 240 // default on Windows. |
| 241 if (!parsed_command_line().HasSwitch(switches::kUseSystemSSL)) { | 241 if (!parsed_command_line().HasSwitch(switches::kUseSystemSSL)) { |
| 242 net::ClientSocketFactory::SetSSLClientSocketFactory( | 242 net::UseNSSSSLProvider(); |
| 243 net::SSLClientSocketNSSFactory); | |
| 244 // We want to be sure to init NSPR on the main thread. | 243 // We want to be sure to init NSPR on the main thread. |
| 245 base::EnsureNSPRInit(); | 244 base::EnsureNSPRInit(); |
| 246 } | 245 } |
| 247 } | 246 } |
| 248 }; | 247 }; |
| 249 | 248 |
| 250 // static | 249 // static |
| 251 BrowserMainParts* BrowserMainParts::CreateBrowserMainParts( | 250 BrowserMainParts* BrowserMainParts::CreateBrowserMainParts( |
| 252 const MainFunctionParams& parameters) { | 251 const MainFunctionParams& parameters) { |
| 253 return new BrowserMainPartsWin(parameters); | 252 return new BrowserMainPartsWin(parameters); |
| 254 } | 253 } |
| OLD | NEW |