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

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

Issue 9730021: Remove experimental sync promo layouts (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: a 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
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 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" 73 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
74 #include "chrome/browser/search_engines/template_url_service.h" 74 #include "chrome/browser/search_engines/template_url_service.h"
75 #include "chrome/browser/search_engines/template_url_service_factory.h" 75 #include "chrome/browser/search_engines/template_url_service_factory.h"
76 #include "chrome/browser/service/service_process_control.h" 76 #include "chrome/browser/service/service_process_control.h"
77 #include "chrome/browser/shell_integration.h" 77 #include "chrome/browser/shell_integration.h"
78 #include "chrome/browser/translate/translate_manager.h" 78 #include "chrome/browser/translate/translate_manager.h"
79 #include "chrome/browser/ui/browser.h" 79 #include "chrome/browser/ui/browser.h"
80 #include "chrome/browser/ui/browser_init.h" 80 #include "chrome/browser/ui/browser_init.h"
81 #include "chrome/browser/ui/webui/chrome_url_data_manager_backend.h" 81 #include "chrome/browser/ui/webui/chrome_url_data_manager_backend.h"
82 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" 82 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
83 #include "chrome/browser/ui/webui/sync_promo/sync_promo_trial.h"
84 #include "chrome/common/child_process_logging.h" 83 #include "chrome/common/child_process_logging.h"
85 #include "chrome/common/chrome_constants.h" 84 #include "chrome/common/chrome_constants.h"
86 #include "chrome/common/chrome_paths.h" 85 #include "chrome/common/chrome_paths.h"
87 #include "chrome/common/chrome_result_codes.h" 86 #include "chrome/common/chrome_result_codes.h"
88 #include "chrome/common/chrome_switches.h" 87 #include "chrome/common/chrome_switches.h"
89 #include "chrome/common/chrome_version_info.h" 88 #include "chrome/common/chrome_version_info.h"
90 #include "chrome/common/env_vars.h" 89 #include "chrome/common/env_vars.h"
91 #include "chrome/common/json_pref_store.h" 90 #include "chrome/common/json_pref_store.h"
92 #include "chrome/common/jstemplate_builder.h" 91 #include "chrome/common/jstemplate_builder.h"
93 #include "chrome/common/logging_chrome.h" 92 #include "chrome/common/logging_chrome.h"
(...skipping 927 matching lines...) Expand 10 before | Expand all | Expand 10 after
1021 ProxyConnectionsFieldTrial(); 1020 ProxyConnectionsFieldTrial();
1022 prerender::ConfigurePrefetchAndPrerender(parsed_command_line()); 1021 prerender::ConfigurePrefetchAndPrerender(parsed_command_line());
1023 InstantFieldTrial::Activate(); 1022 InstantFieldTrial::Activate();
1024 SpdyFieldTrial(); 1023 SpdyFieldTrial();
1025 ConnectBackupJobsFieldTrial(); 1024 ConnectBackupJobsFieldTrial();
1026 WarmConnectionFieldTrial(); 1025 WarmConnectionFieldTrial();
1027 PredictorFieldTrial(); 1026 PredictorFieldTrial();
1028 DefaultAppsFieldTrial(); 1027 DefaultAppsFieldTrial();
1029 AutoLaunchChromeFieldTrial(); 1028 AutoLaunchChromeFieldTrial();
1030 AutocompleteFieldTrial::Activate(); 1029 AutocompleteFieldTrial::Activate();
1031 sync_promo_trial::Activate();
1032 NewTabUI::SetupFieldTrials(); 1030 NewTabUI::SetupFieldTrials();
1033 } 1031 }
1034 1032
1035 void ChromeBrowserMainParts::StartMetricsRecording() { 1033 void ChromeBrowserMainParts::StartMetricsRecording() {
1036 MetricsService* metrics = g_browser_process->metrics_service(); 1034 MetricsService* metrics = g_browser_process->metrics_service();
1037 if (parsed_command_line_.HasSwitch(switches::kMetricsRecordingOnly) || 1035 if (parsed_command_line_.HasSwitch(switches::kMetricsRecordingOnly) ||
1038 parsed_command_line_.HasSwitch(switches::kEnableBenchmarking)) { 1036 parsed_command_line_.HasSwitch(switches::kEnableBenchmarking)) {
1039 // If we're testing then we don't care what the user preference is, we turn 1037 // If we're testing then we don't care what the user preference is, we turn
1040 // on recording, but not reporting, otherwise tests fail. 1038 // on recording, but not reporting, otherwise tests fail.
1041 metrics->StartRecordingOnly(); 1039 metrics->StartRecordingOnly();
(...skipping 907 matching lines...) Expand 10 before | Expand all | Expand 10 after
1949 if (base::win::GetVersion() <= base::win::VERSION_XP) 1947 if (base::win::GetVersion() <= base::win::VERSION_XP)
1950 uma_name += "_XP"; 1948 uma_name += "_XP";
1951 1949
1952 uma_name += "_PreRead_"; 1950 uma_name += "_PreRead_";
1953 uma_name += pre_read_percentage; 1951 uma_name += pre_read_percentage;
1954 AddPreReadHistogramTime(uma_name.c_str(), time); 1952 AddPreReadHistogramTime(uma_name.c_str(), time);
1955 } 1953 }
1956 #endif 1954 #endif
1957 #endif 1955 #endif
1958 } 1956 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/browser_init.h » ('j') | chrome/browser/ui/webui/sync_promo/sync_promo_handler.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698