Index: chrome/common/render_messages.h |
diff --git a/chrome/common/render_messages.h b/chrome/common/render_messages.h |
index 7825461a5bc20b59a0ae0114c2a73b6b7163c01d..0ccebea1b3a7854543872c4add53d8d79c87f500 100644 |
--- a/chrome/common/render_messages.h |
+++ b/chrome/common/render_messages.h |
@@ -115,6 +115,8 @@ struct ParamTraits<ContentSettingsPattern> { |
IPC_ENUM_TRAITS(ChromeViewHostMsg_GetPluginInfo_Status::Value) |
IPC_ENUM_TRAITS(InstantCompleteBehavior) |
+IPC_ENUM_TRAITS(InstantSuggestionType) |
+IPC_ENUM_TRAITS(InstantSizeUnits) |
IPC_ENUM_TRAITS(search_provider::OSDDType) |
IPC_ENUM_TRAITS(search_provider::InstallState) |
IPC_ENUM_TRAITS(TranslateErrors::Type) |
@@ -178,6 +180,20 @@ IPC_STRUCT_TRAITS_BEGIN(WebKit::WebCache::UsageStats) |
IPC_STRUCT_TRAITS_MEMBER(deadSize) |
IPC_STRUCT_TRAITS_END() |
+IPC_STRUCT_TRAITS_BEGIN(InstantNativeSuggestionsParts) |
+ IPC_STRUCT_TRAITS_MEMBER(provider) |
+ IPC_STRUCT_TRAITS_MEMBER(is_search) |
+ IPC_STRUCT_TRAITS_MEMBER(contents) |
+ IPC_STRUCT_TRAITS_MEMBER(destination_url) |
+ IPC_STRUCT_TRAITS_MEMBER(relevance) |
+IPC_STRUCT_TRAITS_END() |
+ |
+IPC_STRUCT_TRAITS_BEGIN(InstantSuggestion) |
+ IPC_STRUCT_TRAITS_MEMBER(text) |
+ IPC_STRUCT_TRAITS_MEMBER(behavior) |
+ IPC_STRUCT_TRAITS_MEMBER(type) |
+IPC_STRUCT_TRAITS_END() |
+ |
//----------------------------------------------------------------------------- |
// RenderView messages |
// These are messages sent from the browser to the renderer process. |
@@ -271,18 +287,39 @@ IPC_MESSAGE_ROUTED4(ChromeViewMsg_SearchBoxChange, |
bool /* verbatim */, |
int /* selection_start */, |
int /* selection_end */) |
+ |
IPC_MESSAGE_ROUTED2(ChromeViewMsg_SearchBoxSubmit, |
string16 /* value */, |
bool /* verbatim */) |
+ |
IPC_MESSAGE_ROUTED0(ChromeViewMsg_SearchBoxCancel) |
+ |
IPC_MESSAGE_ROUTED1(ChromeViewMsg_SearchBoxResize, |
gfx::Rect /* search_box_bounds */) |
+ |
IPC_MESSAGE_ROUTED4(ChromeViewMsg_DetermineIfPageSupportsInstant, |
string16 /* value*/, |
bool /* verbatim */, |
int /* selection_start */, |
int /* selection_end */) |
+IPC_MESSAGE_ROUTED1(ChromeViewMsg_SearchBoxNativeSuggestions, |
+ std::vector<InstantNativeSuggestionsParts> |
+ /* native_suggestions */) |
+ |
+IPC_MESSAGE_ROUTED1(ChromeViewMsg_SearchBoxKeyPress, |
+ int /* keycode */) |
+ |
+IPC_MESSAGE_ROUTED1(ChromeViewMsg_SearchBoxLastQuery, |
+ std::string /* last_query */) |
+ |
+IPC_MESSAGE_ROUTED1(ChromeViewMsg_SearchBoxCurrentURL, |
+ std::string /* current_url */) |
+ |
+IPC_MESSAGE_ROUTED0(ChromeViewMsg_SearchBoxFocused) |
+ |
+IPC_MESSAGE_ROUTED0(ChromeViewMsg_SearchBoxBlurred) |
+ |
// Toggles visual muting of the render view area. This is on when a constrained |
// window is showing. |
IPC_MESSAGE_ROUTED1(ChromeViewMsg_SetVisuallyDeemphasized, |
@@ -597,17 +634,23 @@ IPC_MESSAGE_ROUTED0(ChromeViewHostMsg_DidBlockRunningInsecureContent) |
// and currently accepts keyboard input inside the webpage has been touched. |
IPC_MESSAGE_ROUTED0(ChromeViewHostMsg_FocusedEditableNodeTouched) |
-// Suggest results ----------------------------------------------------------- |
- |
-IPC_MESSAGE_ROUTED3(ChromeViewHostMsg_SetSuggestions, |
- int32 /* page_id */, |
- std::vector<std::string> /* suggestions */, |
- InstantCompleteBehavior) |
+// Sent by the Instant preview to populate the omnibox with query suggestions. |
+IPC_MESSAGE_ROUTED2(ChromeViewHostMsg_SetSuggestions, |
+ int /* page_id */, |
+ std::vector<InstantSuggestion> /* suggestions */) |
+// Sent by the Instant preview indicating whether the page supports the Instant |
+// API or not (http://dev.chromium.org/searchbox). |
IPC_MESSAGE_ROUTED2(ChromeViewHostMsg_InstantSupportDetermined, |
- int32 /* page_id */, |
+ int /* page_id */, |
bool /* result */) |
+// Sent by the Instant preview asking to resize itself to the given height. |
+IPC_MESSAGE_ROUTED3(ChromeViewHostMsg_SetInstantPreviewHeight, |
+ int /* page_id */, |
+ int /* height */, |
+ InstantSizeUnits /* units */) |
+ |
// The currently displayed PDF has an unsupported feature. |
IPC_MESSAGE_ROUTED0(ChromeViewHostMsg_PDFHasUnsupportedFeature) |