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 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
76 #include "chrome/browser/search_engines/template_url.h" | 76 #include "chrome/browser/search_engines/template_url.h" |
77 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" | 77 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" |
78 #include "chrome/browser/search_engines/template_url_service.h" | 78 #include "chrome/browser/search_engines/template_url_service.h" |
79 #include "chrome/browser/search_engines/template_url_service_factory.h" | 79 #include "chrome/browser/search_engines/template_url_service_factory.h" |
80 #include "chrome/browser/service/service_process_control.h" | 80 #include "chrome/browser/service/service_process_control.h" |
81 #include "chrome/browser/shell_integration.h" | 81 #include "chrome/browser/shell_integration.h" |
82 #include "chrome/browser/translate/translate_manager.h" | 82 #include "chrome/browser/translate/translate_manager.h" |
83 #include "chrome/browser/ui/browser.h" | 83 #include "chrome/browser/ui/browser.h" |
84 #include "chrome/browser/ui/browser_init.h" | 84 #include "chrome/browser/ui/browser_init.h" |
85 #include "chrome/browser/ui/webui/chrome_url_data_manager_backend.h" | 85 #include "chrome/browser/ui/webui/chrome_url_data_manager_backend.h" |
86 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" | |
87 #include "chrome/common/child_process_logging.h" | 86 #include "chrome/common/child_process_logging.h" |
88 #include "chrome/common/chrome_constants.h" | 87 #include "chrome/common/chrome_constants.h" |
89 #include "chrome/common/chrome_paths.h" | 88 #include "chrome/common/chrome_paths.h" |
90 #include "chrome/common/chrome_result_codes.h" | 89 #include "chrome/common/chrome_result_codes.h" |
91 #include "chrome/common/chrome_switches.h" | 90 #include "chrome/common/chrome_switches.h" |
92 #include "chrome/common/chrome_version_info.h" | 91 #include "chrome/common/chrome_version_info.h" |
93 #include "chrome/common/env_vars.h" | 92 #include "chrome/common/env_vars.h" |
94 #include "chrome/common/json_pref_store.h" | 93 #include "chrome/common/json_pref_store.h" |
95 #include "chrome/common/jstemplate_builder.h" | 94 #include "chrome/common/jstemplate_builder.h" |
96 #include "chrome/common/logging_chrome.h" | 95 #include "chrome/common/logging_chrome.h" |
(...skipping 1014 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1111 InstantFieldTrial::Activate(); | 1110 InstantFieldTrial::Activate(); |
1112 SpdyFieldTrial(); | 1111 SpdyFieldTrial(); |
1113 ConnectBackupJobsFieldTrial(); | 1112 ConnectBackupJobsFieldTrial(); |
1114 WarmConnectionFieldTrial(); | 1113 WarmConnectionFieldTrial(); |
1115 PredictorFieldTrial(); | 1114 PredictorFieldTrial(); |
1116 DefaultAppsFieldTrial(); | 1115 DefaultAppsFieldTrial(); |
1117 AutoLaunchChromeFieldTrial(); | 1116 AutoLaunchChromeFieldTrial(); |
1118 DomainBoundCertsFieldTrial(); | 1117 DomainBoundCertsFieldTrial(); |
1119 SetupUniformityFieldTrials(); | 1118 SetupUniformityFieldTrials(); |
1120 AutocompleteFieldTrial::Activate(); | 1119 AutocompleteFieldTrial::Activate(); |
1121 NewTabUI::SetupFieldTrials(); | |
1122 } | 1120 } |
1123 | 1121 |
1124 void ChromeBrowserMainParts::StartMetricsRecording() { | 1122 void ChromeBrowserMainParts::StartMetricsRecording() { |
1125 MetricsService* metrics = g_browser_process->metrics_service(); | 1123 MetricsService* metrics = g_browser_process->metrics_service(); |
1126 if (parsed_command_line_.HasSwitch(switches::kMetricsRecordingOnly) || | 1124 if (parsed_command_line_.HasSwitch(switches::kMetricsRecordingOnly) || |
1127 parsed_command_line_.HasSwitch(switches::kEnableBenchmarking)) { | 1125 parsed_command_line_.HasSwitch(switches::kEnableBenchmarking)) { |
1128 // If we're testing then we don't care what the user preference is, we turn | 1126 // If we're testing then we don't care what the user preference is, we turn |
1129 // on recording, but not reporting, otherwise tests fail. | 1127 // on recording, but not reporting, otherwise tests fail. |
1130 metrics->StartRecordingOnly(); | 1128 metrics->StartRecordingOnly(); |
1131 return; | 1129 return; |
(...skipping 887 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2019 if (base::win::GetVersion() <= base::win::VERSION_XP) | 2017 if (base::win::GetVersion() <= base::win::VERSION_XP) |
2020 uma_name += "_XP"; | 2018 uma_name += "_XP"; |
2021 | 2019 |
2022 uma_name += "_PreRead_"; | 2020 uma_name += "_PreRead_"; |
2023 uma_name += pre_read_percentage; | 2021 uma_name += pre_read_percentage; |
2024 AddPreReadHistogramTime(uma_name.c_str(), time); | 2022 AddPreReadHistogramTime(uma_name.c_str(), time); |
2025 } | 2023 } |
2026 #endif | 2024 #endif |
2027 #endif | 2025 #endif |
2028 } | 2026 } |
OLD | NEW |