chrome/browser/autocomplete/shortcuts_provider.cc - Issue 1098843004: Omnibox - Do Not Allow HTTP/HTTPS Equivalence if User Explicitly Entered A Scheme

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/autocomplete/shortcuts_provider.cc

Issue 1098843004: Omnibox - Do Not Allow HTTP/HTTPS Equivalence if User Explicitly Entered A Scheme (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: new approach Created 5 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/autocomplete/search_provider_unittest.cc ('k') | components/omnibox/autocomplete_match.h » ('j') | components/omnibox/autocomplete_match.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/autocomplete/shortcuts_provider.cc

diff --git a/chrome/browser/autocomplete/shortcuts_provider.cc b/chrome/browser/autocomplete/shortcuts_provider.cc

index 8ead62e723d8dad0cccf6424efd8abfcb4feb7df..0d5f8151753cf3cb512bf48d539eafab0d84d133 100644

--- a/chrome/browser/autocomplete/shortcuts_provider.cc

+++ b/chrome/browser/autocomplete/shortcuts_provider.cc

@@ -152,7 +152,8 @@ void ShortcutsProvider::GetMatches(const AutocompleteInput& input) {

if (relevance) {

matches_.push_back(ShortcutToACMatch(it->second, relevance, input,

fixed_up_input));

- matches_.back().ComputeStrippedDestinationURL(template_url_service);

+ matches_.back().ComputeStrippedDestinationURL(

+ input.parts().scheme.is_nonempty(), template_url_service);

}

// Remove duplicates. Duplicates don't need to be preserved in the matches

@@ -236,7 +237,7 @@ AutocompleteMatch ShortcutsProvider::ShortcutToACMatch(

}

match.EnsureUWYTIsAllowedToBeDefault(

- input.canonicalized_url(),

+ input.canonicalized_url(), input.parts().scheme.is_nonempty(),

TemplateURLServiceFactory::GetForProfile(profile_));

// Try to mark pieces of the contents and description as matches if they