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

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

Issue 8689006: Create a field test for sync sign in promo strings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: small typo spotted by tmccoy 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 | « chrome/app/generated_resources.grd ('k') | chrome/browser/resources/sync_promo.js » ('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 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 #include "chrome/browser/search_engines/search_engine_type.h" 71 #include "chrome/browser/search_engines/search_engine_type.h"
72 #include "chrome/browser/search_engines/template_url.h" 72 #include "chrome/browser/search_engines/template_url.h"
73 #include "chrome/browser/search_engines/template_url_service.h" 73 #include "chrome/browser/search_engines/template_url_service.h"
74 #include "chrome/browser/search_engines/template_url_service_factory.h" 74 #include "chrome/browser/search_engines/template_url_service_factory.h"
75 #include "chrome/browser/service/service_process_control.h" 75 #include "chrome/browser/service/service_process_control.h"
76 #include "chrome/browser/shell_integration.h" 76 #include "chrome/browser/shell_integration.h"
77 #include "chrome/browser/translate/translate_manager.h" 77 #include "chrome/browser/translate/translate_manager.h"
78 #include "chrome/browser/ui/browser.h" 78 #include "chrome/browser/ui/browser.h"
79 #include "chrome/browser/ui/browser_init.h" 79 #include "chrome/browser/ui/browser_init.h"
80 #include "chrome/browser/ui/webui/chrome_url_data_manager_backend.h" 80 #include "chrome/browser/ui/webui/chrome_url_data_manager_backend.h"
81 #include "chrome/browser/ui/webui/sync_promo_trial.h"
81 #include "chrome/browser/web_resource/gpu_blacklist_updater.h" 82 #include "chrome/browser/web_resource/gpu_blacklist_updater.h"
82 #include "chrome/common/child_process_logging.h" 83 #include "chrome/common/child_process_logging.h"
83 #include "chrome/common/chrome_constants.h" 84 #include "chrome/common/chrome_constants.h"
84 #include "chrome/common/chrome_paths.h" 85 #include "chrome/common/chrome_paths.h"
85 #include "chrome/common/chrome_result_codes.h" 86 #include "chrome/common/chrome_result_codes.h"
86 #include "chrome/common/chrome_switches.h" 87 #include "chrome/common/chrome_switches.h"
87 #include "chrome/common/chrome_version_info.h" 88 #include "chrome/common/chrome_version_info.h"
88 #include "chrome/common/env_vars.h" 89 #include "chrome/common/env_vars.h"
89 #include "chrome/common/json_pref_store.h" 90 #include "chrome/common/json_pref_store.h"
90 #include "chrome/common/jstemplate_builder.h" 91 #include "chrome/common/jstemplate_builder.h"
(...skipping 1054 matching lines...) Expand 10 before | Expand all | Expand 10 after
1145 // shoud not be performed. 1146 // shoud not be performed.
1146 if (!proxy_policy_is_set) 1147 if (!proxy_policy_is_set)
1147 ProxyConnectionsFieldTrial(); 1148 ProxyConnectionsFieldTrial();
1148 prerender::ConfigurePrefetchAndPrerender(parsed_command_line()); 1149 prerender::ConfigurePrefetchAndPrerender(parsed_command_line());
1149 InstantFieldTrial::Activate(); 1150 InstantFieldTrial::Activate();
1150 SpdyFieldTrial(); 1151 SpdyFieldTrial();
1151 ConnectBackupJobsFieldTrial(); 1152 ConnectBackupJobsFieldTrial();
1152 WarmConnectionFieldTrial(); 1153 WarmConnectionFieldTrial();
1153 PredictorFieldTrial(); 1154 PredictorFieldTrial();
1154 DefaultAppsFieldTrial(); 1155 DefaultAppsFieldTrial();
1156 sync_promo_trial::Activate();
1155 } 1157 }
1156 1158
1157 // ----------------------------------------------------------------------------- 1159 // -----------------------------------------------------------------------------
1158 // TODO(viettrungluu): move more/rest of BrowserMain() into BrowserMainParts. 1160 // TODO(viettrungluu): move more/rest of BrowserMain() into BrowserMainParts.
1159 1161
1160 #if defined(OS_CHROMEOS) 1162 #if defined(OS_CHROMEOS)
1161 // Allows authenticator to be invoked without adding refcounting. The instances 1163 // Allows authenticator to be invoked without adding refcounting. The instances
1162 // will delete themselves upon completion. 1164 // will delete themselves upon completion.
1163 DISABLE_RUNNABLE_METHOD_REFCOUNT(StubLogin); 1165 DISABLE_RUNNABLE_METHOD_REFCOUNT(StubLogin);
1164 #endif 1166 #endif
(...skipping 949 matching lines...) Expand 10 before | Expand all | Expand 10 after
2114 if (env->GetVar(chrome::kPreReadEnvironmentVariable, &pre_read) && 2116 if (env->GetVar(chrome::kPreReadEnvironmentVariable, &pre_read) &&
2115 (pre_read == "0" || pre_read == "1")) { 2117 (pre_read == "0" || pre_read == "1")) {
2116 std::string uma_name(name); 2118 std::string uma_name(name);
2117 uma_name += "_PreRead"; 2119 uma_name += "_PreRead";
2118 uma_name += pre_read == "1" ? "Enabled" : "Disabled"; 2120 uma_name += pre_read == "1" ? "Enabled" : "Disabled";
2119 AddPreReadHistogramTime(uma_name.c_str(), time); 2121 AddPreReadHistogramTime(uma_name.c_str(), time);
2120 } 2122 }
2121 #endif 2123 #endif
2122 #endif 2124 #endif
2123 } 2125 }
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/resources/sync_promo.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698