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_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 "app/app_switches.h" | 9 #include "app/app_switches.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
128 // |-application:openFiles:|, since we already handle them directly. | 128 // |-application:openFiles:|, since we already handle them directly. |
129 [[NSUserDefaults standardUserDefaults] | 129 [[NSUserDefaults standardUserDefaults] |
130 setObject:@"NO" forKey:@"NSTreatUnknownArgumentsAsOpen"]; | 130 setObject:@"NO" forKey:@"NSTreatUnknownArgumentsAsOpen"]; |
131 } | 131 } |
132 | 132 |
133 private: | 133 private: |
134 virtual void InitializeSSL() { | 134 virtual void InitializeSSL() { |
135 // Use NSS for SSL by default. | 135 // Use NSS for SSL by default. |
136 // The default client socket factory uses NSS for SSL by default on Mac. | 136 // The default client socket factory uses NSS for SSL by default on Mac. |
137 if (parsed_command_line().HasSwitch(switches::kUseSystemSSL)) { | 137 if (parsed_command_line().HasSwitch(switches::kUseSystemSSL)) { |
138 net::ClientSocketFactory::SetSSLClientSocketFactory( | 138 net::ClientSocketFactory::UseSystemSSL(); |
139 net::SSLClientSocketMacFactory); | |
140 } else { | 139 } else { |
141 // We want to be sure to init NSPR on the main thread. | 140 // We want to be sure to init NSPR on the main thread. |
142 base::EnsureNSPRInit(); | 141 base::EnsureNSPRInit(); |
143 } | 142 } |
144 } | 143 } |
145 }; | 144 }; |
146 | 145 |
147 // static | 146 // static |
148 BrowserMainParts* BrowserMainParts::CreateBrowserMainParts( | 147 BrowserMainParts* BrowserMainParts::CreateBrowserMainParts( |
149 const MainFunctionParams& parameters) { | 148 const MainFunctionParams& parameters) { |
150 return new BrowserMainPartsMac(parameters); | 149 return new BrowserMainPartsMac(parameters); |
151 } | 150 } |
OLD | NEW |