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 252 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
263 // has already been initialized. | 263 // has already been initialized. |
264 if (!parameters().ui_task) { | 264 if (!parameters().ui_task) { |
265 // Override the configured locale with the user's preferred UI language. | 265 // Override the configured locale with the user's preferred UI language. |
266 l10n_util::OverrideLocaleWithUILanguageList(); | 266 l10n_util::OverrideLocaleWithUILanguageList(); |
267 } | 267 } |
268 } | 268 } |
269 | 269 |
270 private: | 270 private: |
271 virtual void InitializeSSL() { | 271 virtual void InitializeSSL() { |
272 // Use NSS for SSL by default. | 272 // Use NSS for SSL by default. |
273 // Because of a build system issue (http://crbug.com/43461), the default | 273 // The default client socket factory uses NSS for SSL by default on Win. |
wtc
2011/02/23 00:38:38
Nit: Win => Windows.
| |
274 // client socket factory uses SChannel (the system SSL library) for SSL by | 274 if (parsed_command_line().HasSwitch(switches::kUseSystemSSL)) { |
275 // default on Windows. | 275 net::ClientSocketFactory::UseSystemSSL(); |
276 if (!parsed_command_line().HasSwitch(switches::kUseSystemSSL)) { | 276 } else { |
277 net::ClientSocketFactory::SetSSLClientSocketFactory( | |
278 net::SSLClientSocketNSSFactory); | |
279 // We want to be sure to init NSPR on the main thread. | 277 // We want to be sure to init NSPR on the main thread. |
280 base::EnsureNSPRInit(); | 278 base::EnsureNSPRInit(); |
281 } | 279 } |
282 } | 280 } |
283 }; | 281 }; |
284 | 282 |
285 // static | 283 // static |
286 BrowserMainParts* BrowserMainParts::CreateBrowserMainParts( | 284 BrowserMainParts* BrowserMainParts::CreateBrowserMainParts( |
287 const MainFunctionParams& parameters) { | 285 const MainFunctionParams& parameters) { |
288 return new BrowserMainPartsWin(parameters); | 286 return new BrowserMainPartsWin(parameters); |
289 } | 287 } |
OLD | NEW |