summaryrefslogtreecommitdiffstats
path: root/chrome/common/render_messages.h
diff options
context:
space:
mode:
authorjered@chromium.org <jered@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-21 01:51:14 +0000
committerjered@chromium.org <jered@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-21 01:51:14 +0000
commitc3917748748826ea21aa907ab939a22a6b69eec4 (patch)
tree8bf3fbdc7a27f7d12f3569e34172445170db8fff /chrome/common/render_messages.h
parent0eb4016cd093ce984229b91b7fa049205342a026 (diff)
downloadchromium_src-c3917748748826ea21aa907ab939a22a6b69eec4.zip
chromium_src-c3917748748826ea21aa907ab939a22a6b69eec4.tar.gz
chromium_src-c3917748748826ea21aa907ab939a22a6b69eec4.tar.bz2
InstantExtended: Pass search mode to Instant page.
BUG= Review URL: https://chromiumcodereview.appspot.com/11412107 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168949 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/render_messages.h')
-rw-r--r--chrome/common/render_messages.h12
1 files changed, 10 insertions, 2 deletions
diff --git a/chrome/common/render_messages.h b/chrome/common/render_messages.h
index db4cbca..dc5ba77 100644
--- a/chrome/common/render_messages.h
+++ b/chrome/common/render_messages.h
@@ -22,6 +22,7 @@
#include "chrome/common/instant_types.h"
#include "chrome/common/nacl_types.h"
#include "chrome/common/search_provider.h"
+#include "chrome/common/search_types.h"
#include "chrome/common/translate_errors.h"
#include "content/public/common/common_param_traits.h"
#include "ipc/ipc_channel_handle.h"
@@ -170,6 +171,13 @@ IPC_STRUCT_TRAITS_BEGIN(InstantSuggestion)
IPC_STRUCT_TRAITS_MEMBER(type)
IPC_STRUCT_TRAITS_END()
+IPC_ENUM_TRAITS(chrome::search::Mode::Type)
+IPC_ENUM_TRAITS(chrome::search::Mode::Origin)
+IPC_STRUCT_TRAITS_BEGIN(chrome::search::Mode)
+ IPC_STRUCT_TRAITS_MEMBER(mode)
+ IPC_STRUCT_TRAITS_MEMBER(origin)
+IPC_STRUCT_TRAITS_END()
+
IPC_STRUCT_TRAITS_BEGIN(RendererContentSettingRules)
IPC_STRUCT_TRAITS_MEMBER(image_rules)
IPC_STRUCT_TRAITS_MEMBER(script_rules)
@@ -309,8 +317,8 @@ IPC_MESSAGE_ROUTED1(ChromeViewMsg_SearchBoxAutocompleteResults,
IPC_MESSAGE_ROUTED1(ChromeViewMsg_SearchBoxUpOrDownKeyPressed,
int /* count */)
-IPC_MESSAGE_ROUTED1(ChromeViewMsg_SearchBoxActiveTabModeChanged,
- bool /* active_tab_is_ntp */)
+IPC_MESSAGE_ROUTED1(ChromeViewMsg_SearchBoxModeChanged,
+ chrome::search::Mode /* mode */)
IPC_MESSAGE_ROUTED1(ChromeViewMsg_SearchBoxThemeChanged,
ThemeBackgroundInfo /* value */)