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 1084 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1095 if (!proxy_policy_is_set) | 1095 if (!proxy_policy_is_set) |
1096 ProxyConnectionsFieldTrial(); | 1096 ProxyConnectionsFieldTrial(); |
1097 prerender::ConfigurePrefetchAndPrerender(parsed_command_line()); | 1097 prerender::ConfigurePrefetchAndPrerender(parsed_command_line()); |
1098 SpdyFieldTrial(); | 1098 SpdyFieldTrial(); |
1099 ConnectBackupJobsFieldTrial(); | 1099 ConnectBackupJobsFieldTrial(); |
1100 WarmConnectionFieldTrial(); | 1100 WarmConnectionFieldTrial(); |
1101 PredictorFieldTrial(); | 1101 PredictorFieldTrial(); |
1102 DefaultAppsFieldTrial(); | 1102 DefaultAppsFieldTrial(); |
1103 AutoLaunchChromeFieldTrial(); | 1103 AutoLaunchChromeFieldTrial(); |
1104 DomainBoundCertsFieldTrial(); | 1104 DomainBoundCertsFieldTrial(); |
| 1105 gpu_util::InitializeForceCompositingModeFieldTrial(); |
1105 SetupUniformityFieldTrials(); | 1106 SetupUniformityFieldTrials(); |
1106 AutocompleteFieldTrial::Activate(); | 1107 AutocompleteFieldTrial::Activate(); |
1107 } | 1108 } |
1108 | 1109 |
1109 void ChromeBrowserMainParts::StartMetricsRecording() { | 1110 void ChromeBrowserMainParts::StartMetricsRecording() { |
1110 MetricsService* metrics = g_browser_process->metrics_service(); | 1111 MetricsService* metrics = g_browser_process->metrics_service(); |
1111 if (parsed_command_line_.HasSwitch(switches::kMetricsRecordingOnly) || | 1112 if (parsed_command_line_.HasSwitch(switches::kMetricsRecordingOnly) || |
1112 parsed_command_line_.HasSwitch(switches::kEnableBenchmarking)) { | 1113 parsed_command_line_.HasSwitch(switches::kEnableBenchmarking)) { |
1113 // If we're testing then we don't care what the user preference is, we turn | 1114 // If we're testing then we don't care what the user preference is, we turn |
1114 // on recording, but not reporting, otherwise tests fail. | 1115 // on recording, but not reporting, otherwise tests fail. |
(...skipping 890 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2005 if (base::win::GetVersion() <= base::win::VERSION_XP) | 2006 if (base::win::GetVersion() <= base::win::VERSION_XP) |
2006 uma_name += "_XP"; | 2007 uma_name += "_XP"; |
2007 | 2008 |
2008 uma_name += "_PreRead_"; | 2009 uma_name += "_PreRead_"; |
2009 uma_name += pre_read_percentage; | 2010 uma_name += pre_read_percentage; |
2010 AddPreReadHistogramTime(uma_name.c_str(), time); | 2011 AddPreReadHistogramTime(uma_name.c_str(), time); |
2011 } | 2012 } |
2012 #endif | 2013 #endif |
2013 #endif | 2014 #endif |
2014 } | 2015 } |
OLD | NEW |