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

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

Issue 8944001: net: remove DNS certificate checking code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years 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/browser/io_thread.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) 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/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 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 #include "chrome/browser/instant/instant_field_trial.h" 45 #include "chrome/browser/instant/instant_field_trial.h"
46 #include "chrome/browser/jankometer.h" 46 #include "chrome/browser/jankometer.h"
47 #include "chrome/browser/language_usage_metrics.h" 47 #include "chrome/browser/language_usage_metrics.h"
48 #include "chrome/browser/metrics/field_trial_synchronizer.h" 48 #include "chrome/browser/metrics/field_trial_synchronizer.h"
49 #include "chrome/browser/metrics/histogram_synchronizer.h" 49 #include "chrome/browser/metrics/histogram_synchronizer.h"
50 #include "chrome/browser/metrics/metrics_log.h" 50 #include "chrome/browser/metrics/metrics_log.h"
51 #include "chrome/browser/metrics/metrics_service.h" 51 #include "chrome/browser/metrics/metrics_service.h"
52 #include "chrome/browser/metrics/thread_watcher.h" 52 #include "chrome/browser/metrics/thread_watcher.h"
53 #include "chrome/browser/metrics/tracking_synchronizer.h" 53 #include "chrome/browser/metrics/tracking_synchronizer.h"
54 #include "chrome/browser/nacl_host/nacl_process_host.h" 54 #include "chrome/browser/nacl_host/nacl_process_host.h"
55 #include "chrome/browser/net/chrome_dns_cert_provenance_checker.h"
56 #include "chrome/browser/net/chrome_dns_cert_provenance_checker_factory.h"
57 #include "chrome/browser/net/chrome_net_log.h" 55 #include "chrome/browser/net/chrome_net_log.h"
58 #include "chrome/browser/net/predictor.h" 56 #include "chrome/browser/net/predictor.h"
59 #include "chrome/browser/notifications/desktop_notification_service.h" 57 #include "chrome/browser/notifications/desktop_notification_service.h"
60 #include "chrome/browser/notifications/desktop_notification_service_factory.h" 58 #include "chrome/browser/notifications/desktop_notification_service_factory.h"
61 #include "chrome/browser/plugin_prefs.h" 59 #include "chrome/browser/plugin_prefs.h"
62 #include "chrome/browser/policy/browser_policy_connector.h" 60 #include "chrome/browser/policy/browser_policy_connector.h"
63 #include "chrome/browser/prefs/pref_service.h" 61 #include "chrome/browser/prefs/pref_service.h"
64 #include "chrome/browser/prefs/pref_value_store.h" 62 #include "chrome/browser/prefs/pref_value_store.h"
65 #include "chrome/browser/prerender/prerender_field_trial.h" 63 #include "chrome/browser/prerender/prerender_field_trial.h"
66 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h" 64 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h"
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
275 273
276 if (parsed_command_line.HasSwitch(switches::kMaxSpdySessionsPerDomain)) { 274 if (parsed_command_line.HasSwitch(switches::kMaxSpdySessionsPerDomain)) {
277 int value; 275 int value;
278 base::StringToInt( 276 base::StringToInt(
279 parsed_command_line.GetSwitchValueASCII( 277 parsed_command_line.GetSwitchValueASCII(
280 switches::kMaxSpdySessionsPerDomain), 278 switches::kMaxSpdySessionsPerDomain),
281 &value); 279 &value);
282 net::SpdySessionPool::set_max_sessions_per_domain(value); 280 net::SpdySessionPool::set_max_sessions_per_domain(value);
283 } 281 }
284 282
285 SetDnsCertProvenanceCheckerFactory(CreateChromeDnsCertProvenanceChecker);
286
287 if (parsed_command_line.HasSwitch(switches::kEnableWebSocketOverSpdy)) { 283 if (parsed_command_line.HasSwitch(switches::kEnableWebSocketOverSpdy)) {
288 // Enable WebSocket over SPDY. 284 // Enable WebSocket over SPDY.
289 net::WebSocketJob::set_websocket_over_spdy_enabled(true); 285 net::WebSocketJob::set_websocket_over_spdy_enabled(true);
290 } 286 }
291 287
292 if (parsed_command_line.HasSwitch(switches::kEnableHttpPipelining)) 288 if (parsed_command_line.HasSwitch(switches::kEnableHttpPipelining))
293 net::HttpStreamFactory::set_http_pipelining_enabled(true); 289 net::HttpStreamFactory::set_http_pipelining_enabled(true);
294 290
295 if (parsed_command_line.HasSwitch(switches::kTestingFixedHttpPort)) { 291 if (parsed_command_line.HasSwitch(switches::kTestingFixedHttpPort)) {
296 int value; 292 int value;
(...skipping 1883 matching lines...) Expand 10 before | Expand all | Expand 10 after
2180 if (env->GetVar(chrome::kPreReadEnvironmentVariable, &pre_read) && 2176 if (env->GetVar(chrome::kPreReadEnvironmentVariable, &pre_read) &&
2181 (pre_read == "0" || pre_read == "1")) { 2177 (pre_read == "0" || pre_read == "1")) {
2182 std::string uma_name(name); 2178 std::string uma_name(name);
2183 uma_name += "_PreRead"; 2179 uma_name += "_PreRead";
2184 uma_name += pre_read == "1" ? "Enabled" : "Disabled"; 2180 uma_name += pre_read == "1" ? "Enabled" : "Disabled";
2185 AddPreReadHistogramTime(uma_name.c_str(), time); 2181 AddPreReadHistogramTime(uma_name.c_str(), time);
2186 } 2182 }
2187 #endif 2183 #endif
2188 #endif 2184 #endif
2189 } 2185 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/io_thread.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698