diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-15 18:31:22 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-15 18:31:22 +0000 |
| commit | 7b9f36791bc6caec093a18d790bba7bff03b54d0 (patch) | |
| tree | 82f4631e118157c872185e830a7afe869b24e713 /chrome/browser/importer | |
| parent | 94f9a0f686619656ca4ff2b6511179dc2132cc5d (diff) | |
| download | chromium_src-7b9f36791bc6caec093a18d790bba7bff03b54d0.zip chromium_src-7b9f36791bc6caec093a18d790bba7bff03b54d0.tar.gz chromium_src-7b9f36791bc6caec093a18d790bba7bff03b54d0.tar.bz2 | |
Fixes bug where keyword editor would end up prefixing all keyword urls
with "http://" if they didn't have one. This proves problematic as for
the google search url we don't have http:// and don't want it. The fix
is to only add http:// if the url field is editable. If the url field
isn't editable, we know the user hasn't editted it and don't need to
try and fix it up.
BUG=13282
TEST=see bug, but also make sure you don't run into any other problems
with the keyword editor.
Review URL: http://codereview.chromium.org/126052
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18410 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/importer')
| -rw-r--r-- | chrome/browser/importer/importer.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/importer/importer.cc b/chrome/browser/importer/importer.cc index e3b1782..b3a36a3 100644 --- a/chrome/browser/importer/importer.cc +++ b/chrome/browser/importer/importer.cc @@ -191,9 +191,9 @@ static std::string BuildHostPathKey(const TemplateURL* t_url, if (t_url->url()->SupportsReplacement()) { return HostPathKeyForURL( - t_url->url()->ReplaceSearchTerms( + GURL(WideToUTF8(t_url->url()->ReplaceSearchTerms( *t_url, L"random string", - TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, std::wstring())); + TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, std::wstring())))); } } return std::string(); |