Instant Extended: Add prominent search term support

chrome/browser/ui/toolbar/toolbar_model_impl.h

Index: chrome/browser/ui/toolbar/toolbar_model_impl.h
diff --git a/chrome/browser/ui/toolbar/toolbar_model_impl.h b/chrome/browser/ui/toolbar/toolbar_model_impl.h
index 80b5ae0db01b82f043c840fbe0c2440a6676323e..3f243307a95907c5131837251e9fab2f93292da3 100644
--- a/chrome/browser/ui/toolbar/toolbar_model_impl.h
+++ b/chrome/browser/ui/toolbar/toolbar_model_impl.h
@@ -41,7 +41,8 @@ class ToolbarModelImpl : public ToolbarModel {
       bool display_search_urls_as_search_terms) const OVERRIDE;
   virtual string16 GetCorpusNameForMobile() const OVERRIDE;
   virtual GURL GetURL() const OVERRIDE;
-  virtual bool WouldReplaceSearchURLWithSearchTerms() const OVERRIDE;
+  virtual SearchTermsType GetSearchTermsType() const OVERRIDE;
+  virtual void SetSupportsExtractionOfURLLikeSearchTerms(bool value) OVERRIDE;
   virtual SecurityLevel GetSecurityLevel() const OVERRIDE;
   virtual int GetIcon() const OVERRIDE;
   virtual string16 GetEVCertName() const OVERRIDE;
@@ -61,15 +62,17 @@ class ToolbarModelImpl : public ToolbarModel {
   // Helper method to extract the profile from the navigation controller.
   Profile* GetProfile() const;
 
-  // Returns search terms as in chrome::GetSearchTerms unless those
-  // terms would be treated by the omnibox as a navigation.
-  string16 GetSearchTerms() const;
+  // Returns the type of the given search terms.
+  SearchTermsType GetSearchTermsTypeInternal(
+      const string16& search_terms) const;
 
   ToolbarModelDelegate* delegate_;
 
   // Whether the text in the location bar is currently being edited.
   bool input_in_progress_;
 
+  bool supports_extraction_of_url_like_search_terms_;
+
   DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarModelImpl);
 };