diff options
| author | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-05 12:41:14 +0000 |
|---|---|---|
| committer | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-05 12:41:14 +0000 |
| commit | c067b0f3974531ca5f8e197f85a6143cf4fd8c35 (patch) | |
| tree | 026bd49d10e95432b467be1d7c89128553e96e51 /chrome/browser/ui | |
| parent | 78290dfb6eeca8a522cc473d43613d4ab572be3f (diff) | |
| download | chromium_src-c067b0f3974531ca5f8e197f85a6143cf4fd8c35.zip chromium_src-c067b0f3974531ca5f8e197f85a6143cf4fd8c35.tar.gz chromium_src-c067b0f3974531ca5f8e197f85a6143cf4fd8c35.tar.bz2 | |
Turn off the search engine selector for the Russian locale.
BUG=81578
TEST=no search engine selector in organic builds in Russian locale.
Review URL: http://codereview.chromium.org/6927022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84235 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui')
| -rw-r--r-- | chrome/browser/ui/cocoa/first_run_dialog.mm | 3 | ||||
| -rw-r--r-- | chrome/browser/ui/gtk/first_run_dialog.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/ui/views/first_run_search_engine_view.cc | 5 |
3 files changed, 9 insertions, 3 deletions
diff --git a/chrome/browser/ui/cocoa/first_run_dialog.mm b/chrome/browser/ui/cocoa/first_run_dialog.mm index da369ad..3d4541e 100644 --- a/chrome/browser/ui/cocoa/first_run_dialog.mm +++ b/chrome/browser/ui/cocoa/first_run_dialog.mm @@ -148,7 +148,8 @@ void ShowFirstRunDialog(Profile* profile, // If the default search is not managed via policy, ask the user to // choose a default. TemplateURLModel* model = profile->GetTemplateURLModel(); - if (model && !model->is_default_search_managed()) { + if (!FirstRun::SearchEngineSelectorDisallowed() || + model && !model->is_default_search_managed()) { ShowSearchEngineSelectionDialog(profile, randomize_search_engine_experiment); } diff --git a/chrome/browser/ui/gtk/first_run_dialog.cc b/chrome/browser/ui/gtk/first_run_dialog.cc index 7bf29a9..bfd3be4 100644 --- a/chrome/browser/ui/gtk/first_run_dialog.cc +++ b/chrome/browser/ui/gtk/first_run_dialog.cc @@ -106,7 +106,9 @@ bool FirstRunDialog::Show(Profile* profile, // Figure out which dialogs we will show. // If the default search is managed via policy, we won't ask. const TemplateURLModel* search_engines_model = profile->GetTemplateURLModel(); - bool show_search_engines_dialog = search_engines_model && + bool show_search_engines_dialog = + !FirstRun::SearchEngineSelectorDisallowed() && + search_engines_model && !search_engines_model->is_default_search_managed(); #if defined(GOOGLE_CHROME_BUILD) diff --git a/chrome/browser/ui/views/first_run_search_engine_view.cc b/chrome/browser/ui/views/first_run_search_engine_view.cc index 20426a9..58f8beb 100644 --- a/chrome/browser/ui/views/first_run_search_engine_view.cc +++ b/chrome/browser/ui/views/first_run_search_engine_view.cc @@ -12,6 +12,7 @@ #include "base/rand_util.h" #include "base/time.h" #include "base/utf_string_conversions.h" +#include "chrome/browser/first_run/first_run.h" #include "chrome/browser/first_run/first_run_dialog.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search_engines/search_engine_type.h" @@ -57,8 +58,10 @@ void ShowFirstRunDialog(Profile* profile, // If the default search is managed via policy, we don't ask the user to // choose. TemplateURLModel* model = profile->GetTemplateURLModel(); - if (NULL == model || model->is_default_search_managed()) + if (FirstRun::SearchEngineSelectorDisallowed() || !model || + model->is_default_search_managed()) { return; + } views::Window* window = views::Window::CreateChromeWindow( NULL, |