Omnibox - Do Not Allow HTTP/HTTPS Equivalence if User Explicitly Entered A Scheme

components/omnibox/autocomplete_input.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef COMPONENTS_OMNIBOX_AUTOCOMPLETE_INPUT_H_
 #define COMPONENTS_OMNIBOX_AUTOCOMPLETE_INPUT_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 166 matching lines @@
 
   // Returns whether this input is allowed to be treated as an exact
   // keyword match.  If not, the default result is guaranteed not to be a
   // keyword search, even if the input is "<keyword> <search string>".
   bool allow_exact_keyword_match() const { return allow_exact_keyword_match_; }
 
   // Returns whether providers should be allowed to make asynchronous requests
   // when processing this input.
   bool want_asynchronous_matches() const { return want_asynchronous_matches_; }
 
+  // Returns list of words in text() that start with http:// or https://,

[Peter Kasting, 2015/06/09 20:36:39]

Nit: text() -> text_

"...or https:// plus at least one more character, ..."

[Mark P, 2015/06/10 23:38:34]

Done.
Done.

+  // stored without the prefix.  Used in duplicate elimination to detect

[Peter Kasting, 2015/06/09 20:36:39]

Nit: prefix -> scheme

(Technically this is less accurate but it seems clearer to me after the change I
suggest above.)

[Mark P, 2015/06/10 23:38:34]

Okay, done.

+  // whether the user expressed interest in a particular URL with a requested
+  // scheme (and hence we shouldn't de-dup across schemes).

[Peter Kasting, 2015/06/09 20:36:39]

Nit: How about:

"...to detect whether, for a given URL, the user may have started typing that
URL with an explicit scheme; see comments on
AutocompleteMatch::GURLToStrippedGURL()."

[Mark P, 2015/06/10 23:38:34]

Ah, that's good to make a reference to where the important code is.  Done.

+  const std::vector<base::string16>& http_following_terms() const {

[Peter Kasting, 2015/06/09 20:36:39]

Hmm, I don't love this name... maybe terms_following_explicit_scheme or
terms_prefixed_by_http_or_https?  I can't think of a non-awkward name.

[Mark P, 2015/06/10 23:38:34]

The latter sounds better to me (though as you admit it's still awkward).  Done.

+    return http_following_terms_;
+  }
+
   // Resets all internal variables to the null-constructed state.
   void Clear();
 
  private:
   friend class AutocompleteProviderTest;
 
   // NOTE: Whenever adding a new field here, please make sure to update Clear()
   // method.
   base::string16 text_;
   size_t cursor_position_;
   GURL current_url_;
   metrics::OmniboxEventProto::PageClassification current_page_classification_;
   metrics::OmniboxInputType::Type type_;
   url::Parsed parts_;
   base::string16 scheme_;
   GURL canonicalized_url_;
   bool prevent_inline_autocomplete_;
   bool prefer_keyword_;
   bool allow_exact_keyword_match_;
   bool want_asynchronous_matches_;
+  std::vector<base::string16> http_following_terms_;
 };
 
 #endif  // COMPONENTS_OMNIBOX_AUTOCOMPLETE_INPUT_H_