diff options
| author | tyoshino@chromium.org <tyoshino@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-19 04:32:29 +0000 |
|---|---|---|
| committer | tyoshino@chromium.org <tyoshino@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-19 04:32:29 +0000 |
| commit | f12cb6439d837429037975c44956425d6a9f34c0 (patch) | |
| tree | 899840567c35a5e93df29ffd19eccfbbabbb187a /chrome/browser/search_engines/template_url_model.cc | |
| parent | b17e19920b54ca8b92d73dcb1cc03dae1d6b7ad0 (diff) | |
| download | chromium_src-f12cb6439d837429037975c44956425d6a9f34c0.zip chromium_src-f12cb6439d837429037975c44956425d6a9f34c0.tar.gz chromium_src-f12cb6439d837429037975c44956425d6a9f34c0.tar.bz2 | |
Revert 63005 - If default search is managed, we should not asked the user to choose it at First Run. Make sure the minimum bubble is not showed if there is no default search.
BUG=49306
TEST=Set a managed default search provider. Clear your Chromium user data directory (~/Library/Chromium, ~/.config/chromium, %localappdata%\Chromium) and the "First Run" file found next to the executable. Start Chrome. It should not ask you to choose a default search provider. Disable the default search provider via policy. Make sure the minimal bubble is not shown. Redo these tests for the GOOGLE_CHROME_BUILD to make sure that we still ask about usage stats.
Review URL: http://codereview.chromium.org/3565013
TBR=jeanluc@google.com
Review URL: http://codereview.chromium.org/3747009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63016 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/search_engines/template_url_model.cc')
| -rw-r--r-- | chrome/browser/search_engines/template_url_model.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/search_engines/template_url_model.cc b/chrome/browser/search_engines/template_url_model.cc index e7bcb92..4d0d33c 100644 --- a/chrome/browser/search_engines/template_url_model.cc +++ b/chrome/browser/search_engines/template_url_model.cc @@ -803,8 +803,10 @@ bool TemplateURLModel::LoadDefaultSearchProviderFromPrefs( if (!prefs || !prefs->HasPrefPath(prefs::kDefaultSearchProviderSearchURL)) return false; + // By default, kDefaultSearchProviderEnabled is true. Users of previous + // versions will transition correctly. const PrefService::Preference* pref = - prefs->FindPreference(prefs::kDefaultSearchProviderSearchURL); + prefs->FindPreference(prefs::kDefaultSearchProviderEnabled); *is_managed = pref && pref->IsManaged(); bool enabled = |