summaryrefslogtreecommitdiffstats
path: root/chrome/browser/search_engines/template_url.h
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-15 18:31:22 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-15 18:31:22 +0000
commit7b9f36791bc6caec093a18d790bba7bff03b54d0 (patch)
tree82f4631e118157c872185e830a7afe869b24e713 /chrome/browser/search_engines/template_url.h
parent94f9a0f686619656ca4ff2b6511179dc2132cc5d (diff)
downloadchromium_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/search_engines/template_url.h')
-rw-r--r--chrome/browser/search_engines/template_url.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/search_engines/template_url.h b/chrome/browser/search_engines/template_url.h
index d59a420..5abcb14 100644
--- a/chrome/browser/search_engines/template_url.h
+++ b/chrome/browser/search_engines/template_url.h
@@ -63,7 +63,7 @@ class TemplateURLRef {
// returns false), an empty string is returned.
//
// The TemplateURL is used to determine the input encoding for the term.
- GURL ReplaceSearchTerms(
+ std::wstring ReplaceSearchTerms(
const TemplateURL& host,
const std::wstring& terms,
int accepted_suggestion,