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..d3ab0053dceb638bfd7c797988ee7940688f28c7 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 SearchTermType GetSearchTermType() const OVERRIDE;
+  virtual void SetIsProminentSearchTermUISupported(bool value) OVERRIDE;
   virtual SecurityLevel GetSecurityLevel() const OVERRIDE;
   virtual int GetIcon() const OVERRIDE;
   virtual string16 GetEVCertName() const OVERRIDE;
@@ -61,15 +62,21 @@ 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;
+  // Gets search terms as in chrome::GetSearchTerms. The only exception is
+  // if the search terms would be treated by the omnibox as navigation and
+  // prominent search term UI is not supported, in which case this returns an
+  // empty string.. Also returns the search term type.

[Peter Kasting, 2013/04/25 19:42:54]

Nit: Two periods

[sail, 2013/04/25 22:18:46]

Done.

+  SearchTermType GetSearchTerms(string16* search_terms_out) const;
 
   ToolbarModelDelegate* delegate_;
 
   // Whether the text in the location bar is currently being edited.
   bool input_in_progress_;
 
+  // True if the UI can display a more prominent UI for search terms that
+  // require it.
+  bool is_prominent_search_term_ui_supported_;
+
   DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarModelImpl);
 };