Show the location bar icon (almost) all the time, and have its contents match what the user is doing.

There are a couple major moving parts here:

* Change AutocompletePopupModel::URLsForCurrentText() to InfoForCurrentText() and have it return an AutocompleteMatch, which callers can use to parse out whatever they want.  I needed to get at the match type for the current text and found the proliferation of arguments here ridiculous.  This had major ripple effects throughout the codebase, including changing the name and location of SearchVersusNavigateClassifier as it no longer had an "is_search" parameter directly, so the name became misleading and too narrow.  I also ended up adding a null constructor for AutocompleteMatch because it was too cumbersome otherwise.

* Change the name of the "SecurityImageView" (or similar) to reflect its broader purpose, and plumb it to the edit to get an icon instead of to the toolbar model.

* Add an AutocompleteMatch::Type to icon mapping function, and use it not only in the new code but also to simplify showing the popup contents.

BUG=27570,39725
TEST=An icon should appear next to the address at all times.  It should be a globe on non-secure pages, a magnifying glass on the NTP, and a match for whatever the user is typing as he types.
Review URL: http://codereview.chromium.org/1457002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43025 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 21 insertions, 15 deletions

diff --git a/chrome/browser/autocomplete/autocomplete.h b/chrome/browser/autocomplete/autocomplete.h
index d64fd6c..124783f1 100644
--- a/chrome/browser/autocomplete/autocomplete.h
+++ b/chrome/browser/autocomplete/autocomplete.h
@@ -314,22 +314,24 @@ struct AutocompleteMatch {
 
   // The type of this match.
   enum Type {
-    URL_WHAT_YOU_TYPED,     // The input as a URL.
-    HISTORY_URL,            // A past page whose URL contains the input.
-    HISTORY_TITLE,          // A past page whose title contains the input.
-    HISTORY_BODY,           // A past page whose body contains the input.
-    HISTORY_KEYWORD,        // A past page whose keyword contains the input.
-    NAVSUGGEST,             // A suggested URL.
-    SEARCH_WHAT_YOU_TYPED,  // The input as a search query (with the default
-                            // engine).
-    SEARCH_HISTORY,         // A past search (with the default engine)
-                            // containing the input.
-    SEARCH_SUGGEST,         // A suggested search (with the default engine).
-    SEARCH_OTHER_ENGINE,    // A search with a non-default engine.
-    OPEN_HISTORY_PAGE,      // A synthetic result that opens the history page to
-                            // search for the input.
+    URL_WHAT_YOU_TYPED = 0,  // The input as a URL.
+    HISTORY_URL,             // A past page whose URL contains the input.
+    HISTORY_TITLE,           // A past page whose title contains the input.
+    HISTORY_BODY,            // A past page whose body contains the input.
+    HISTORY_KEYWORD,         // A past page whose keyword contains the input.
+    NAVSUGGEST,              // A suggested URL.
+    SEARCH_WHAT_YOU_TYPED,   // The input as a search query (with the default
+                             // engine).
+    SEARCH_HISTORY,          // A past search (with the default engine)
+                             // containing the input.
+    SEARCH_SUGGEST,          // A suggested search (with the default engine).
+    SEARCH_OTHER_ENGINE,     // A search with a non-default engine.
+    OPEN_HISTORY_PAGE,       // A synthetic result that opens the history page
+                             // to search for the input.
+    NUM_TYPES,
   };
 
+  AutocompleteMatch();
   AutocompleteMatch(AutocompleteProvider* provider,
                     int relevance,
                     bool deletable,
@@ -338,6 +340,10 @@ struct AutocompleteMatch {
   // Converts |type| to a string representation.  Used in logging.
   static std::string TypeToString(Type type);
 
+  // Converts |type| to a resource identifier for the appropriate icon for this
+  // type.
+  static int TypeToIcon(Type type);
+
   // Comparison function for determining when one match is better than another.
   static bool MoreRelevant(const AutocompleteMatch& elem1,
                            const AutocompleteMatch& elem2);
@@ -776,7 +782,7 @@ class AutocompleteController : public ACProviderListener {
   const AutocompleteInput& input() const { return input_; }
   const AutocompleteResult& result() const { return result_; }
   // This next is temporary and should go away when
-  // AutocompletePopup::URLsForCurrentSelection() moves to the controller.
+  // AutocompletePopup::InfoForCurrentSelection() moves to the controller.
   const AutocompleteResult& latest_result() const { return latest_result_; }
   bool done() const { return done_ && !update_delay_timer_.IsRunning(); }