Instant Extended: Add prominent search term support

chrome/browser/ui/toolbar/toolbar_model.h

Index: chrome/browser/ui/toolbar/toolbar_model.h
diff --git a/chrome/browser/ui/toolbar/toolbar_model.h b/chrome/browser/ui/toolbar/toolbar_model.h
index c9aead57fff741cfa46fb07dc355dc6b48afb5a5..2454c3633f72ba4a9212a0218c6104a7063a9f7d 100644
--- a/chrome/browser/ui/toolbar/toolbar_model.h
+++ b/chrome/browser/ui/toolbar/toolbar_model.h
@@ -29,6 +29,17 @@ class ToolbarModel {
 #undef DEFINE_TOOLBAR_MODEL_SECURITY_LEVEL
   };
 
+  enum SearchTermType {

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

Nit: Add comment above enum:

If search URLs may be displayed as search terms, these are the types of search
terms that may be extracted from the URL.  See comments on GetText() and
GetSearchTermsType().

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

Done.

+    // There are no search terms.
+    SEARCH_TERM_NONE,
+    // There are regular search terms.
+    SEARCH_TERM_NORMAL,
+    // There are search terms that require a more prominent UI. For example,
+    // if the search term looks like a URL then it should be clear to the user
+    // that a search term is being displayed.
+    SEARCH_TERM_PROMINENT,

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

I think these would make more sense named as:

NO_SEARCH_TERMS,
NORMAL_SEARCH_TERMS,
URL_LIKE_SEARCH_TERMS

This removes the idea of "what is the UI to show these" from the ToolbarModel,
which really doesn't care about such a concept, and instead just phrases things
in terms of different kinds of search terms.  It also avoids using "PROMINENT"
alone which is a bit confusing (as compared to something like
PROMINENT_UI_NEEDED).

I realize that URL_LIKE_... may be a misnomer for normal-looking search terms
with a mixed-content warning present; since that's intended to be an
error-handling case (Google should normally never have mixed-content problems),
I think it's OK to just add a comment about why we're doing this to the
appropriate spot in the implementation.

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

Done.

+  };
+
   virtual ~ToolbarModel() {}
 
   // Returns the text for the current page's URL. This will have been formatted
@@ -50,9 +61,13 @@ class ToolbarModel {
   // Returns the URL of the current navigation entry.
   virtual GURL GetURL() const = 0;
 
-  // Returns true if a call to GetText(true) would successfully replace the URL
-  // with search terms.
-  virtual bool WouldReplaceSearchURLWithSearchTerms() const = 0;
+  // This indicates the type of search terms returned by a call to
+  // GetText(true).
+  virtual SearchTermType GetSearchTermType() const = 0;

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

Tiny nit: GetSearchTermsType() seems more correct

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

Done.

+
+  // Setter for whether the UI can display a more prominent UI for search terms
+  // that require it.
+  virtual void SetIsProminentSearchTermUISupported(bool value) = 0;

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

With the enum naming change above, this would become

  SetSupportsExtractionOfURLLikeSearchTerms()

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

Done.

 
   // Returns the security level that the toolbar should display.
   virtual SecurityLevel GetSecurityLevel() const = 0;