diff options
author | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-21 00:35:01 +0000 |
---|---|---|
committer | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-21 00:35:01 +0000 |
commit | 15406b6ab2f2c701d6e82c8e53c22d1c570c739a (patch) | |
tree | 3ec5bf3f1ca12625e4dff0f5579b7f3ad787248b /chrome/browser/browser_main.cc | |
parent | ff62185663f68c9d40dc13dec778ca0e321afdf9 (diff) | |
download | chromium_src-15406b6ab2f2c701d6e82c8e53c22d1c570c739a.zip chromium_src-15406b6ab2f2c701d6e82c8e53c22d1c570c739a.tar.gz chromium_src-15406b6ab2f2c701d6e82c8e53c22d1c570c739a.tar.bz2 |
Check for proper locale before recording search engine data, or offering the search engine experimental dialog.
BUG= 37564
TEST= none
Review URL: http://codereview.chromium.org/1709003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45129 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_main.cc')
-rw-r--r-- | chrome/browser/browser_main.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index f83d34a..5275a3a 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -1146,9 +1146,11 @@ int BrowserMain(const MainFunctionParams& parameters) { // See issue 40144. profile->GetExtensionsService()->InitEventRouters(); +#if defined(OS_WIN) // We check this here because if the profile is OTR (chromeos possibility) // it won't still be accessible after browser is destroyed. bool record_search_engine = is_first_run && !profile->IsOffTheRecord(); +#endif int result_code = ResultCodes::NORMAL_EXIT; if (parameters.ui_task) { @@ -1187,11 +1189,12 @@ int BrowserMain(const MainFunctionParams& parameters) { } } +#if defined(OS_WIN) // If it's the first run, log the search engine chosen. We wait until // shutdown because otherwise we can't be sure the user has finished // selecting a search engine through the dialog reached from the first run // bubble link. - if (record_search_engine) { + if (FirstRun::InSearchExperimentLocale() && record_search_engine) { const TemplateURL* default_search_engine = profile->GetTemplateURLModel()->GetDefaultSearchProvider(); if (master_prefs.run_search_engine_experiment) { @@ -1208,6 +1211,7 @@ int BrowserMain(const MainFunctionParams& parameters) { TemplateURLPrepopulateData::SEARCH_ENGINE_MAX); } } +#endif chrome_browser_net_websocket_experiment::WebSocketExperimentRunner::Stop(); |