diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-01 19:12:31 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-01 19:12:31 +0000 |
| commit | ff3cad1f41f0d04322e00475e63ea5b6e523cb3b (patch) | |
| tree | a6f8877baadadef71692c8a2b205bdd5624c0bf9 /chrome | |
| parent | 32772e96d7fb129119a540947704f1d39500ee98 (diff) | |
| download | chromium_src-ff3cad1f41f0d04322e00475e63ea5b6e523cb3b.zip chromium_src-ff3cad1f41f0d04322e00475e63ea5b6e523cb3b.tar.gz chromium_src-ff3cad1f41f0d04322e00475e63ea5b6e523cb3b.tar.bz2 | |
Make the omnibox treat all paths that end in \ or / as URLs, not just paths that consist solely of a slash.
BUG=102435
TEST=Typing "abcdef/ghi j" should show a search (magnifying glass) as the default action, but adding a '\' or '/' should change it to a navigation (globe).
Review URL: http://codereview.chromium.org/8427019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108147 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/autocomplete/autocomplete.cc | 7 | ||||
| -rw-r--r-- | chrome/browser/autocomplete/autocomplete_unittest.cc | 3 |
2 files changed, 8 insertions, 2 deletions
diff --git a/chrome/browser/autocomplete/autocomplete.cc b/chrome/browser/autocomplete/autocomplete.cc index 3ade9b5..020db00 100644 --- a/chrome/browser/autocomplete/autocomplete.cc +++ b/chrome/browser/autocomplete/autocomplete.cc @@ -359,8 +359,11 @@ AutocompleteInput::Type AutocompleteInput::Parse( return URL; // Trailing slashes force the input to be treated as a URL. - if (parts->path.len == 1) - return URL; + if (parts->path.is_nonempty()) { + char c = text[parts->path.end() - 1]; + if ((c == '\\') || (c == '/')) + return URL; + } // If there is more than one recognized non-host component, this is likely to // be a URL, even if the TLD is unknown (in which case this is likely an diff --git a/chrome/browser/autocomplete/autocomplete_unittest.cc b/chrome/browser/autocomplete/autocomplete_unittest.cc index 1fc0277..26d0bc7 100644 --- a/chrome/browser/autocomplete/autocomplete_unittest.cc +++ b/chrome/browser/autocomplete/autocomplete_unittest.cc @@ -291,7 +291,10 @@ TEST_F(AutocompleteTest, InputType) { { ASCIIToUTF16("-foo.com"), AutocompleteInput::URL }, { ASCIIToUTF16("foo-.com"), AutocompleteInput::UNKNOWN }, { ASCIIToUTF16("foo.-com"), AutocompleteInput::QUERY }, + { ASCIIToUTF16("foo/"), AutocompleteInput::URL }, { ASCIIToUTF16("foo/bar"), AutocompleteInput::UNKNOWN }, + { ASCIIToUTF16("foo/bar/"), AutocompleteInput::URL }, + { ASCIIToUTF16("foo/bar baz\\"), AutocompleteInput::URL }, { ASCIIToUTF16("foo.com/bar"), AutocompleteInput::URL }, { ASCIIToUTF16("foo;bar"), AutocompleteInput::QUERY }, { ASCIIToUTF16("foo/bar baz"), AutocompleteInput::UNKNOWN }, |