diff options
| author | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-27 15:53:46 +0000 |
|---|---|---|
| committer | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-27 15:53:46 +0000 |
| commit | 0339765bba60104c098aeacc02f10ae629f4a494 (patch) | |
| tree | 4973928039ece8f4ba9f8a5631ced5559a7561cc /chrome/browser/importer/ie_importer.cc | |
| parent | e94f1860db455c3af9e8e245505b2335e5cf1be5 (diff) | |
| download | chromium_src-0339765bba60104c098aeacc02f10ae629f4a494.zip chromium_src-0339765bba60104c098aeacc02f10ae629f4a494.tar.gz chromium_src-0339765bba60104c098aeacc02f10ae629f4a494.tar.bz2 | |
Add logo display for fourth search engine in search engine selection dialog.
BUG=57993
TEST=Set the search engine on your (non-Chrome) default browser to be NOT in the top three for your region.
For USA, for example, you could use Baidu or Aol Search. Start Chrome with --first-run switch on an empty profile.
You should see the fourth search engine selection represented by a logo, not just text (if it's included in the list of logos for which we have images).
Review URL: http://codereview.chromium.org/4109001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64074 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/importer/ie_importer.cc')
| -rw-r--r-- | chrome/browser/importer/ie_importer.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome/browser/importer/ie_importer.cc b/chrome/browser/importer/ie_importer.cc index e8fa047..7965b462 100644 --- a/chrome/browser/importer/ie_importer.cc +++ b/chrome/browser/importer/ie_importer.cc @@ -33,6 +33,7 @@ #include "chrome/browser/password_manager/ie7_password.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_model.h" +#include "chrome/browser/search_engines/template_url_prepopulate_data.h" #include "chrome/common/time_format.h" #include "chrome/common/url_constants.h" #include "googleurl/src/gurl.h" @@ -392,8 +393,11 @@ void IEImporter::ImportSearchEngines() { template_url->set_short_name(name); template_url->SetURL(url, 0, 0); // Give this a keyword to facilitate tab-to-search, if possible. - template_url->set_keyword(TemplateURLModel::GenerateKeyword(GURL(url), + GURL gurl = GURL(url); + template_url->set_keyword(TemplateURLModel::GenerateKeyword(gurl, false)); + template_url->set_logo_id( + TemplateURLPrepopulateData::GetSearchEngineLogo(gurl)); template_url->set_show_in_default_list(true); search_engines_map[url] = template_url; } |