Review URL: http://codereview.chromium.org/8393025

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107302 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 1 insertions, 18 deletions

diff --git a/chrome/browser/first_run/first_run.cc b/chrome/browser/first_run/first_run.cc
index 27f7d12..841f143 100644
--- a/chrome/browser/first_run/first_run.cc
+++ b/chrome/browser/first_run/first_run.cc
@@ -449,21 +449,8 @@ bool FirstRun::SetPersonalDataManagerFirstRunPref() {
 }
 
 // static
-bool FirstRun::SearchEngineSelectorDisallowed() {
-#if defined(GOOGLE_CHROME_BUILD)
-  // For now, the only case in which the search engine dialog should never be
-  // shown is if the locale is Russia.
-  std::string locale = g_browser_process->GetApplicationLocale();
-  return (locale == "ru");
-#else
-  return false;
-#endif
-}
-
-// static
 bool FirstRun::ShouldShowSearchEngineSelector(const TemplateURLService* model) {
-  return !SearchEngineSelectorDisallowed() &&
-         model && !model->is_default_search_managed();
+  return model && !model->is_default_search_managed();
 }
 
 // static
diff --git a/chrome/browser/first_run/first_run.h b/chrome/browser/first_run/first_run.h
index 235754c..7bdf1fc 100644
--- a/chrome/browser/first_run/first_run.h
+++ b/chrome/browser/first_run/first_run.h
@@ -128,10 +128,6 @@ class FirstRun {
   // Returns false if the pref could not be set.
   static bool SetPersonalDataManagerFirstRunPref();
 
-  // True if special circumstances should prevent the search engine ballot from
-  // being shown.
-  static bool SearchEngineSelectorDisallowed();
-
   // Whether the search engine selection dialog should be shown on first run.
   static bool ShouldShowSearchEngineSelector(const TemplateURLService* model);