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

Side by Side Diff: chrome/browser/browser_main_win.cc

Issue 6805019: Move crypto files out of base, to a top level directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Chrome, webkit, remoting and crypto/owners Created 9 years, 8 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 | Annotate | Revision Log
OLDNEW
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/metrics/metrics_service.h" 24 #include "chrome/browser/metrics/metrics_service.h"
25 #include "chrome/browser/ui/browser_list.h" 25 #include "chrome/browser/ui/browser_list.h"
26 #include "chrome/browser/ui/views/uninstall_view.h" 26 #include "chrome/browser/ui/views/uninstall_view.h"
27 #include "chrome/common/chrome_constants.h" 27 #include "chrome/common/chrome_constants.h"
28 #include "chrome/common/chrome_switches.h" 28 #include "chrome/common/chrome_switches.h"
29 #include "chrome/common/env_vars.h" 29 #include "chrome/common/env_vars.h"
30 #include "chrome/installer/util/browser_distribution.h" 30 #include "chrome/installer/util/browser_distribution.h"
31 #include "chrome/installer/util/helper.h" 31 #include "chrome/installer/util/helper.h"
32 #include "chrome/installer/util/install_util.h" 32 #include "chrome/installer/util/install_util.h"
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
287 287
288 private: 288 private:
289 virtual void InitializeSSL() { 289 virtual void InitializeSSL() {
290 // Use NSS for SSL by default. 290 // Use NSS for SSL by default.
291 // The default client socket factory uses NSS for SSL by default on 291 // The default client socket factory uses NSS for SSL by default on
292 // Windows. 292 // Windows.
293 if (parsed_command_line().HasSwitch(switches::kUseSystemSSL)) { 293 if (parsed_command_line().HasSwitch(switches::kUseSystemSSL)) {
294 net::ClientSocketFactory::UseSystemSSL(); 294 net::ClientSocketFactory::UseSystemSSL();
295 } else { 295 } else {
296 // We want to be sure to init NSPR on the main thread. 296 // We want to be sure to init NSPR on the main thread.
297 base::EnsureNSPRInit(); 297 crypto::EnsureNSPRInit();
298 } 298 }
299 } 299 }
300 }; 300 };
301 301
302 // static 302 // static
303 BrowserMainParts* BrowserMainParts::CreateBrowserMainParts( 303 BrowserMainParts* BrowserMainParts::CreateBrowserMainParts(
304 const MainFunctionParams& parameters) { 304 const MainFunctionParams& parameters) {
305 return new BrowserMainPartsWin(parameters); 305 return new BrowserMainPartsWin(parameters);
306 } 306 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698