| Index: content/common/view_messages.h
|
| ===================================================================
|
| --- content/common/view_messages.h (revision 163514)
|
| +++ content/common/view_messages.h (working copy)
|
| @@ -61,7 +61,6 @@
|
|
|
| IPC_ENUM_TRAITS(AccessibilityMode)
|
| IPC_ENUM_TRAITS(CSSColors::CSSColorName)
|
| -IPC_ENUM_TRAITS(NavigationGesture)
|
| IPC_ENUM_TRAITS(ViewMsg_Navigate_Type::Value)
|
| IPC_ENUM_TRAITS(WebKit::WebContextMenuData::MediaType)
|
| IPC_ENUM_TRAITS(WebKit::WebMediaPlayerAction::Type)
|
| @@ -72,6 +71,7 @@
|
| IPC_ENUM_TRAITS(WindowContainerType)
|
| IPC_ENUM_TRAITS(content::FileChooserParams::Mode)
|
| IPC_ENUM_TRAITS(content::JavaScriptMessageType)
|
| +IPC_ENUM_TRAITS(content::NavigationGesture)
|
| IPC_ENUM_TRAITS(content::PageZoom)
|
| IPC_ENUM_TRAITS(content::RendererPreferencesHintingEnum)
|
| IPC_ENUM_TRAITS(content::RendererPreferencesSubpixelRenderingEnum)
|
| @@ -80,11 +80,6 @@
|
| IPC_ENUM_TRAITS(media::MediaLogEvent::Type)
|
| IPC_ENUM_TRAITS(ui::TextInputType)
|
|
|
| -IPC_STRUCT_TRAITS_BEGIN(EditCommand)
|
| - IPC_STRUCT_TRAITS_MEMBER(name)
|
| - IPC_STRUCT_TRAITS_MEMBER(value)
|
| -IPC_STRUCT_TRAITS_END()
|
| -
|
| #if defined(OS_MACOSX)
|
| IPC_STRUCT_TRAITS_BEGIN(FontDescriptor)
|
| IPC_STRUCT_TRAITS_MEMBER(font_name)
|
| @@ -287,6 +282,11 @@
|
| IPC_STRUCT_TRAITS_MEMBER(render_widget_id)
|
| IPC_STRUCT_TRAITS_END()
|
|
|
| +IPC_STRUCT_TRAITS_BEGIN(content::EditCommand)
|
| + IPC_STRUCT_TRAITS_MEMBER(name)
|
| + IPC_STRUCT_TRAITS_MEMBER(value)
|
| +IPC_STRUCT_TRAITS_END()
|
| +
|
| IPC_STRUCT_TRAITS_BEGIN(content::FileChooserParams)
|
| IPC_STRUCT_TRAITS_MEMBER(mode)
|
| IPC_STRUCT_TRAITS_MEMBER(title)
|
| @@ -481,7 +481,7 @@
|
| IPC_STRUCT_MEMBER(std::string, security_info)
|
|
|
| // The gesture that initiated this navigation.
|
| - IPC_STRUCT_MEMBER(NavigationGesture, gesture)
|
| + IPC_STRUCT_MEMBER(content::NavigationGesture, gesture)
|
|
|
| // True if this was a post request.
|
| IPC_STRUCT_MEMBER(bool, is_post)
|
| @@ -953,7 +953,7 @@
|
| //
|
| // This message must be sent just before sending a key event.
|
| IPC_MESSAGE_ROUTED1(ViewMsg_SetEditCommandsForNextKeyEvent,
|
| - std::vector<EditCommand> /* edit_commands */)
|
| + std::vector<content::EditCommand> /* edit_commands */)
|
|
|
| // Message payload is the name/value of a WebCore edit command to execute.
|
| IPC_MESSAGE_ROUTED2(ViewMsg_ExecuteEditCommand,
|
|
|