Instant Extended: Add prominent search term support

chrome/browser/ui/toolbar/toolbar_model_impl.h

 // Copyright 2012 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 CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_MODEL_IMPL_H_
 #define CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_MODEL_IMPL_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 23 matching lines @@
   virtual ~ToolbarModelImpl();
 
   static SecurityLevel GetSecurityLevelForWebContents(
       content::WebContents* web_contents);
 
   // Overriden from ToolbarModel.
   virtual string16 GetText(
       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;
   virtual bool ShouldDisplayURL() const OVERRIDE;
   virtual void SetInputInProgress(bool value) OVERRIDE;
   virtual bool GetInputInProgress() const OVERRIDE;
 
   // Returns "<organization_name> [<country>]".
   static string16 GetEVCertName(const net::X509Certificate& cert);
 
  private:
   // Returns the navigation controller used to retrieve the navigation entry
   // from which the states are retrieved.
   // If this returns NULL, default values are used.
   content::NavigationController* GetNavigationController() const;
 
   // 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. Also returns the search term

[sreeram, 2013/04/25 16:37:10]

"... not supported, in which case this returns an empty string."

[sail, 2013/04/25 16:41:22]

Done.

+  // type.
+  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);
 };
 
 #endif  // CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_MODEL_IMPL_H_