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

Side by Side Diff: chrome/browser/browser_main_mac.mm

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: Fixes comments by eroman 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
« no previous file with comments | « chrome/browser/browser_main_gtk.cc ('k') | chrome/browser/browser_main_win.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_posix.h" 5 #include "chrome/browser/browser_main_posix.h"
6 6
7 #import <Cocoa/Cocoa.h> 7 #import <Cocoa/Cocoa.h>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/debug/debugger.h" 10 #include "base/debug/debugger.h"
11 #include "base/file_path.h" 11 #include "base/file_path.h"
12 #include "base/mac/mac_util.h" 12 #include "base/mac/mac_util.h"
13 #include "base/memory/scoped_nsobject.h" 13 #include "base/memory/scoped_nsobject.h"
14 #include "base/nss_util.h"
15 #include "base/path_service.h" 14 #include "base/path_service.h"
15 #include "crypto/nss_util.h"
16 #include "chrome/app/breakpad_mac.h" 16 #include "chrome/app/breakpad_mac.h"
17 #import "chrome/browser/app_controller_mac.h" 17 #import "chrome/browser/app_controller_mac.h"
18 #include "chrome/browser/browser_main_win.h" 18 #include "chrome/browser/browser_main_win.h"
19 #import "chrome/browser/chrome_browser_application_mac.h" 19 #import "chrome/browser/chrome_browser_application_mac.h"
20 #import "chrome/browser/cocoa/keystone_glue.h" 20 #import "chrome/browser/cocoa/keystone_glue.h"
21 #include "chrome/browser/metrics/metrics_service.h" 21 #include "chrome/browser/metrics/metrics_service.h"
22 #include "chrome/common/chrome_paths.h" 22 #include "chrome/common/chrome_paths.h"
23 #include "chrome/common/chrome_switches.h" 23 #include "chrome/common/chrome_switches.h"
24 #include "content/common/main_function_params.h" 24 #include "content/common/main_function_params.h"
25 #include "content/common/result_codes.h" 25 #include "content/common/result_codes.h"
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 } 130 }
131 131
132 private: 132 private:
133 virtual void InitializeSSL() { 133 virtual void InitializeSSL() {
134 // Use NSS for SSL by default. 134 // Use NSS for SSL by default.
135 // The default client socket factory uses NSS for SSL by default on Mac. 135 // The default client socket factory uses NSS for SSL by default on Mac.
136 if (parsed_command_line().HasSwitch(switches::kUseSystemSSL)) { 136 if (parsed_command_line().HasSwitch(switches::kUseSystemSSL)) {
137 net::ClientSocketFactory::UseSystemSSL(); 137 net::ClientSocketFactory::UseSystemSSL();
138 } else { 138 } else {
139 // We want to be sure to init NSPR on the main thread. 139 // We want to be sure to init NSPR on the main thread.
140 base::EnsureNSPRInit(); 140 crypto::EnsureNSPRInit();
141 } 141 }
142 } 142 }
143 }; 143 };
144 144
145 // static 145 // static
146 BrowserMainParts* BrowserMainParts::CreateBrowserMainParts( 146 BrowserMainParts* BrowserMainParts::CreateBrowserMainParts(
147 const MainFunctionParams& parameters) { 147 const MainFunctionParams& parameters) {
148 return new BrowserMainPartsMac(parameters); 148 return new BrowserMainPartsMac(parameters);
149 } 149 }
OLDNEW
« no previous file with comments | « chrome/browser/browser_main_gtk.cc ('k') | chrome/browser/browser_main_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698