Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 249 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 260 } | 260 } |
| 261 | 261 |
| 262 if (parsed_command_line.HasSwitch(switches::kEnableWebSocketOverSpdy)) { | 262 if (parsed_command_line.HasSwitch(switches::kEnableWebSocketOverSpdy)) { |
| 263 // Enable WebSocket over SPDY. | 263 // Enable WebSocket over SPDY. |
| 264 net::WebSocketJob::set_websocket_over_spdy_enabled(true); | 264 net::WebSocketJob::set_websocket_over_spdy_enabled(true); |
| 265 } | 265 } |
| 266 | 266 |
| 267 if (parsed_command_line.HasSwitch(switches::kEnableHttpPipelining)) | 267 if (parsed_command_line.HasSwitch(switches::kEnableHttpPipelining)) |
| 268 net::HttpStreamFactory::set_http_pipelining_enabled(true); | 268 net::HttpStreamFactory::set_http_pipelining_enabled(true); |
| 269 | 269 |
| 270 if (parsed_command_line.HasSwitch(switches::kEnableSPDY3)) { | |
|
willchan no longer on Chromium
2012/03/21 16:15:32
How does this command line flag interact with the
ramant (doing other things)
2012/03/21 18:46:36
If --use-sdy=off, then enable-spdy3 is ignored.
C
willchan no longer on Chromium
2012/03/21 23:01:55
What about --use-spdy=v3? or --use-spdy=flow-contr
| |
| 271 std::vector<std::string> next_protos; | |
| 272 next_protos.push_back("http/1.1"); | |
| 273 next_protos.push_back("spdy/2"); | |
| 274 next_protos.push_back("spdy/2.1"); | |
| 275 next_protos.push_back("spdy/3"); | |
| 276 net::HttpStreamFactory::SetNextProtos(next_protos); | |
| 277 } | |
| 278 | |
| 270 if (parsed_command_line.HasSwitch(switches::kTestingFixedHttpPort)) { | 279 if (parsed_command_line.HasSwitch(switches::kTestingFixedHttpPort)) { |
| 271 int value; | 280 int value; |
| 272 base::StringToInt( | 281 base::StringToInt( |
| 273 parsed_command_line.GetSwitchValueASCII( | 282 parsed_command_line.GetSwitchValueASCII( |
| 274 switches::kTestingFixedHttpPort), | 283 switches::kTestingFixedHttpPort), |
| 275 &value); | 284 &value); |
| 276 net::HttpStreamFactory::set_testing_fixed_http_port(value); | 285 net::HttpStreamFactory::set_testing_fixed_http_port(value); |
| 277 } | 286 } |
| 278 | 287 |
| 279 if (parsed_command_line.HasSwitch(switches::kTestingFixedHttpsPort)) { | 288 if (parsed_command_line.HasSwitch(switches::kTestingFixedHttpsPort)) { |
| (...skipping 1663 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1943 if (base::win::GetVersion() <= base::win::VERSION_XP) | 1952 if (base::win::GetVersion() <= base::win::VERSION_XP) |
| 1944 uma_name += "_XP"; | 1953 uma_name += "_XP"; |
| 1945 | 1954 |
| 1946 uma_name += "_PreRead_"; | 1955 uma_name += "_PreRead_"; |
| 1947 uma_name += pre_read_percentage; | 1956 uma_name += pre_read_percentage; |
| 1948 AddPreReadHistogramTime(uma_name.c_str(), time); | 1957 AddPreReadHistogramTime(uma_name.c_str(), time); |
| 1949 } | 1958 } |
| 1950 #endif | 1959 #endif |
| 1951 #endif | 1960 #endif |
| 1952 } | 1961 } |
| OLD | NEW |