OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 222 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
233 l10n_util::OverrideLocaleWithUILanguageList(); | 233 l10n_util::OverrideLocaleWithUILanguageList(); |
234 } | 234 } |
235 } | 235 } |
236 | 236 |
237 private: | 237 private: |
238 virtual void InitializeSSL() { | 238 virtual void InitializeSSL() { |
239 // Use NSS for SSL by default. | 239 // Use NSS for SSL by default. |
240 // Because of a build system issue (http://crbug.com/43461), the default | 240 // Because of a build system issue (http://crbug.com/43461), the default |
241 // client socket factory uses SChannel (the system SSL library) for SSL by | 241 // client socket factory uses SChannel (the system SSL library) for SSL by |
242 // default on Windows. | 242 // default on Windows. |
| 243 |
| 244 // Disabling this temporarily to test out if NSS is causing heap corruption. |
| 245 #if 0 |
243 if (!parsed_command_line().HasSwitch(switches::kUseSystemSSL)) { | 246 if (!parsed_command_line().HasSwitch(switches::kUseSystemSSL)) { |
244 net::ClientSocketFactory::SetSSLClientSocketFactory( | 247 net::ClientSocketFactory::SetSSLClientSocketFactory( |
245 net::SSLClientSocketNSSFactory); | 248 net::SSLClientSocketNSSFactory); |
246 // We want to be sure to init NSPR on the main thread. | 249 // We want to be sure to init NSPR on the main thread. |
247 base::EnsureNSPRInit(); | 250 base::EnsureNSPRInit(); |
248 } | 251 } |
| 252 #endif |
249 } | 253 } |
250 }; | 254 }; |
251 | 255 |
252 // static | 256 // static |
253 BrowserMainParts* BrowserMainParts::CreateBrowserMainParts( | 257 BrowserMainParts* BrowserMainParts::CreateBrowserMainParts( |
254 const MainFunctionParams& parameters) { | 258 const MainFunctionParams& parameters) { |
255 return new BrowserMainPartsWin(parameters); | 259 return new BrowserMainPartsWin(parameters); |
256 } | 260 } |
OLD | NEW |