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 <shellapi.h> | 8 #include <shellapi.h> |
9 #include <windows.h> | 9 #include <windows.h> |
10 | 10 |
11 #include <algorithm> | 11 #include <algorithm> |
12 | 12 |
13 #include "base/command_line.h" | 13 #include "base/command_line.h" |
14 #include "base/environment.h" | 14 #include "base/environment.h" |
15 #include "base/i18n/rtl.h" | 15 #include "base/i18n/rtl.h" |
16 #include "base/memory/scoped_native_library.h" | 16 #include "base/memory/scoped_native_library.h" |
17 #include "base/memory/scoped_ptr.h" | 17 #include "base/memory/scoped_ptr.h" |
18 #include "base/nss_util.h" | |
19 #include "base/path_service.h" | 18 #include "base/path_service.h" |
20 #include "base/utf_string_conversions.h" | 19 #include "base/utf_string_conversions.h" |
21 #include "base/win/windows_version.h" | 20 #include "base/win/windows_version.h" |
22 #include "base/win/wrapped_window_proc.h" | 21 #include "base/win/wrapped_window_proc.h" |
| 22 #include "crypto/nss_util.h" |
23 #include "chrome/browser/first_run/first_run.h" | 23 #include "chrome/browser/first_run/first_run.h" |
24 #include "chrome/browser/first_run/upgrade.h" | 24 #include "chrome/browser/first_run/upgrade.h" |
25 #include "chrome/browser/metrics/metrics_service.h" | 25 #include "chrome/browser/metrics/metrics_service.h" |
26 #include "chrome/browser/ui/browser_list.h" | 26 #include "chrome/browser/ui/browser_list.h" |
27 #include "chrome/browser/ui/views/uninstall_view.h" | 27 #include "chrome/browser/ui/views/uninstall_view.h" |
28 #include "chrome/common/chrome_constants.h" | 28 #include "chrome/common/chrome_constants.h" |
29 #include "chrome/common/chrome_switches.h" | 29 #include "chrome/common/chrome_switches.h" |
30 #include "chrome/common/env_vars.h" | 30 #include "chrome/common/env_vars.h" |
31 #include "chrome/installer/util/browser_distribution.h" | 31 #include "chrome/installer/util/browser_distribution.h" |
32 #include "chrome/installer/util/helper.h" | 32 #include "chrome/installer/util/helper.h" |
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
288 | 288 |
289 private: | 289 private: |
290 virtual void InitializeSSL() { | 290 virtual void InitializeSSL() { |
291 // Use NSS for SSL by default. | 291 // Use NSS for SSL by default. |
292 // The default client socket factory uses NSS for SSL by default on | 292 // The default client socket factory uses NSS for SSL by default on |
293 // Windows. | 293 // Windows. |
294 if (parsed_command_line().HasSwitch(switches::kUseSystemSSL)) { | 294 if (parsed_command_line().HasSwitch(switches::kUseSystemSSL)) { |
295 net::ClientSocketFactory::UseSystemSSL(); | 295 net::ClientSocketFactory::UseSystemSSL(); |
296 } else { | 296 } else { |
297 // We want to be sure to init NSPR on the main thread. | 297 // We want to be sure to init NSPR on the main thread. |
298 base::EnsureNSPRInit(); | 298 crypto::EnsureNSPRInit(); |
299 } | 299 } |
300 } | 300 } |
301 }; | 301 }; |
302 | 302 |
303 // static | 303 // static |
304 BrowserMainParts* BrowserMainParts::CreateBrowserMainParts( | 304 BrowserMainParts* BrowserMainParts::CreateBrowserMainParts( |
305 const MainFunctionParams& parameters) { | 305 const MainFunctionParams& parameters) { |
306 return new BrowserMainPartsWin(parameters); | 306 return new BrowserMainPartsWin(parameters); |
307 } | 307 } |
OLD | NEW |