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

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

Issue 9700056: Remove experimental support for MAC cookies (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove unused global Created 8 years, 9 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 | « no previous file | chrome/common/chrome_switches.h » ('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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/chrome_browser_main.h" 5 #include "chrome/browser/chrome_browser_main.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 } 232 }
233 #endif // USE_LINUX_BREAKPAD 233 #endif // USE_LINUX_BREAKPAD
234 234
235 void InitializeNetworkOptions(const CommandLine& parsed_command_line) { 235 void InitializeNetworkOptions(const CommandLine& parsed_command_line) {
236 if (parsed_command_line.HasSwitch(switches::kEnableFileCookies)) { 236 if (parsed_command_line.HasSwitch(switches::kEnableFileCookies)) {
237 // Enable cookie storage for file:// URLs. Must do this before the first 237 // Enable cookie storage for file:// URLs. Must do this before the first
238 // Profile (and therefore the first CookieMonster) is created. 238 // Profile (and therefore the first CookieMonster) is created.
239 net::CookieMonster::EnableFileScheme(); 239 net::CookieMonster::EnableFileScheme();
240 } 240 }
241 241
242 if (parsed_command_line.HasSwitch(switches::kEnableMacCookies))
243 net::URLRequest::EnableMacCookies();
244
245 if (parsed_command_line.HasSwitch(switches::kIgnoreCertificateErrors)) 242 if (parsed_command_line.HasSwitch(switches::kIgnoreCertificateErrors))
246 net::HttpStreamFactory::set_ignore_certificate_errors(true); 243 net::HttpStreamFactory::set_ignore_certificate_errors(true);
247 244
248 if (parsed_command_line.HasSwitch(switches::kHostRules)) 245 if (parsed_command_line.HasSwitch(switches::kHostRules))
249 net::HttpStreamFactory::SetHostMappingRules( 246 net::HttpStreamFactory::SetHostMappingRules(
250 parsed_command_line.GetSwitchValueASCII(switches::kHostRules)); 247 parsed_command_line.GetSwitchValueASCII(switches::kHostRules));
251 248
252 if (parsed_command_line.HasSwitch(switches::kEnableIPPooling)) 249 if (parsed_command_line.HasSwitch(switches::kEnableIPPooling))
253 net::SpdySessionPool::enable_ip_pooling(true); 250 net::SpdySessionPool::enable_ip_pooling(true);
254 251
(...skipping 1707 matching lines...) Expand 10 before | Expand all | Expand 10 after
1962 if (base::win::GetVersion() <= base::win::VERSION_XP) 1959 if (base::win::GetVersion() <= base::win::VERSION_XP)
1963 uma_name += "_XP"; 1960 uma_name += "_XP";
1964 1961
1965 uma_name += "_PreRead_"; 1962 uma_name += "_PreRead_";
1966 uma_name += pre_read_percentage; 1963 uma_name += pre_read_percentage;
1967 AddPreReadHistogramTime(uma_name.c_str(), time); 1964 AddPreReadHistogramTime(uma_name.c_str(), time);
1968 } 1965 }
1969 #endif 1966 #endif
1970 #endif 1967 #endif
1971 } 1968 }
OLDNEW
« no previous file with comments | « no previous file | chrome/common/chrome_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698