Send match type for Instant extended mode.

Also:
+ Remove deprecated SetPreviewHeight().
+ Rename contents to description.
+ Remove is_search. We don't support non-URL entries in the native
  (restricted) autocomplete results.
+ Other cosmetic changes.

BUG=159740
R=sky@chromium.org,dcblack@chromium.org,jschuh@chromium.org
TEST=none; no change in functionality.


Review URL: https://chromiumcodereview.appspot.com/11312175

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

3 files changed, 11 insertions, 15 deletions

diff --git a/chrome/common/instant_types.cc b/chrome/common/instant_types.cc
index cf50e1c..86b4461 100644
--- a/chrome/common/instant_types.cc
+++ b/chrome/common/instant_types.cc
@@ -20,9 +20,7 @@ InstantSuggestion::InstantSuggestion(const string16& in_text,
 InstantSuggestion::~InstantSuggestion() {
 }
 
-InstantAutocompleteResult::InstantAutocompleteResult()
-    : is_search(false),
-      relevance(0) {
+InstantAutocompleteResult::InstantAutocompleteResult() : relevance(0) {
 }
 
 InstantAutocompleteResult::~InstantAutocompleteResult() {
diff --git a/chrome/common/instant_types.h b/chrome/common/instant_types.h
index ed075b06..627a565 100644
--- a/chrome/common/instant_types.h
+++ b/chrome/common/instant_types.h
@@ -49,21 +49,19 @@ struct InstantAutocompleteResult {
   InstantAutocompleteResult();
   ~InstantAutocompleteResult();
 
-  // The provider name. May be empty.
+  // The provider name, as returned by AutocompleteProvider::GetName().
   string16 provider;
 
-  // True iff this is a search suggestion.
-  bool is_search;
+  // The type of the result, as returned by AutocompleteMatch::TypeToString().
+  string16 type;
 
-  // The title of the match.
-  string16 contents;
+  // The description (title), same as AutocompleteMatch::description.
+  string16 description;
 
-  // The URL of the match.
-  // TODO(dhollowa): Remove this once the privacy story is sorted out.
-  GURL destination_url;
+  // The URL of the match, same as AutocompleteMatch::destination_url.
+  string16 destination_url;
 
-  // The relevance score of this match. Same as the relevance score stored in
-  // AutocompleteMatch.
+  // The relevance score of this match, same as AutocompleteMatch::relevance.
   int relevance;
 };
 
diff --git a/chrome/common/render_messages.h b/chrome/common/render_messages.h
index 79b051e..8953ef0 100644
--- a/chrome/common/render_messages.h
+++ b/chrome/common/render_messages.h
@@ -156,8 +156,8 @@ IPC_STRUCT_TRAITS_END()
 
 IPC_STRUCT_TRAITS_BEGIN(InstantAutocompleteResult)
   IPC_STRUCT_TRAITS_MEMBER(provider)
-  IPC_STRUCT_TRAITS_MEMBER(is_search)
-  IPC_STRUCT_TRAITS_MEMBER(contents)
+  IPC_STRUCT_TRAITS_MEMBER(type)
+  IPC_STRUCT_TRAITS_MEMBER(description)
   IPC_STRUCT_TRAITS_MEMBER(destination_url)
   IPC_STRUCT_TRAITS_MEMBER(relevance)
 IPC_STRUCT_TRAITS_END()