Omnibox: Fix URL-What-You-Typed Allowed-To-Be-Default-Match Issues

chrome/browser/autocomplete/base_search_provider.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.
 //
 // This class contains common functionality for search-based autocomplete
 // providers. Search provider and zero suggest provider both use it for common
 // functionality.
 
 #ifndef CHROME_BROWSER_AUTOCOMPLETE_BASE_SEARCH_PROVIDER_H_
 #define CHROME_BROWSER_AUTOCOMPLETE_BASE_SEARCH_PROVIDER_H_
@@ skipping 117 matching lines @@
     int relevance() const { return relevance_; }
     void set_relevance(int relevance) { relevance_ = relevance; }
 
     bool relevance_from_server() const { return relevance_from_server_; }
     void set_relevance_from_server(bool relevance_from_server) {
       relevance_from_server_ = relevance_from_server;
     }
 
     const std::string& deletion_url() const { return deletion_url_; }
 
-    // Returns if this result is inlineable against the current input |input|.
-    // Non-inlineable results are stale.
-    virtual bool IsInlineable(const base::string16& input) const = 0;
-
     // Returns the default relevance value for this result (which may
     // be left over from a previous omnibox input) given the current
     // input and whether the current input caused a keyword provider
     // to be active.
     virtual int CalculateRelevance(const AutocompleteInput& input,
                                    bool keyword_provider_requested) const = 0;
 
    protected:
     // The contents to be displayed and its style info.
     base::string16 match_contents_;
@@ skipping 54 matching lines @@
     bool should_prefetch() const { return should_prefetch_; }
 
     // Fills in |match_contents_class_| to reflect how |match_contents_| should
     // be displayed and bolded against the current |input_text|.  If
     // |allow_bolding_all| is false and |match_contents_class_| would have all
     // of |match_contents_| bolded, do nothing.
     void ClassifyMatchContents(const bool allow_bolding_all,
                                const base::string16& input_text);
 
     // Result:
-    virtual bool IsInlineable(const base::string16& input) const OVERRIDE;
     virtual int CalculateRelevance(
         const AutocompleteInput& input,
         bool keyword_provider_requested) const OVERRIDE;
 
    private:
     // The search terms to be used for this suggestion.
     base::string16 suggestion_;
 
     // The contents to be displayed as prefix of match contents.
     // Used for postfix suggestions to display a leading ellipsis (or some
@@ skipping 42 matching lines @@
     // Fills in |match_contents_| and |match_contents_class_| to reflect how
     // the URL should be displayed and bolded against the current |input_text|
     // and user |languages|.  If |allow_bolding_nothing| is false and
     // |match_contents_class_| would result in an entirely unbolded
     // |match_contents_|, do nothing.
     void CalculateAndClassifyMatchContents(const bool allow_bolding_nothing,
                                            const base::string16& input_text,
                                            const std::string& languages);
 
     // Result:
-    virtual bool IsInlineable(const base::string16& input) const OVERRIDE;
     virtual int CalculateRelevance(
         const AutocompleteInput& input,
         bool keyword_provider_requested) const OVERRIDE;
 
    private:
     // The suggested url for navigation.
     GURL url_;
 
     // The properly formatted ("fixed up") URL string with equivalent meaning
     // to the one in |url_|.
@@ skipping 236 matching lines @@
 
   // True if this provider's results are being displayed in the app list. By
   // default this is false, meaning that the results will be shown in the
   // omnibox.
   bool in_app_list_;
 
   DISALLOW_COPY_AND_ASSIGN(BaseSearchProvider);
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_BASE_SEARCH_PROVIDER_H_