| Index: content/common/view_messages.h
|
| diff --git a/content/common/view_messages.h b/content/common/view_messages.h
|
| index 362320b418f7eed7b06c94c0400aff8348161f14..d767d779a36fce53ca43adbbc589c66491e8ae75 100644
|
| --- a/content/common/view_messages.h
|
| +++ b/content/common/view_messages.h
|
| @@ -20,6 +20,7 @@
|
| #include "content/common/view_message_enums.h"
|
| #include "content/common/webplugin_geometry.h"
|
| #include "content/port/common/input_event_ack_state.h"
|
| +#include "content/public/common/color_suggestion.h"
|
| #include "content/public/common/common_param_traits.h"
|
| #include "content/public/common/context_menu_params.h"
|
| #include "content/public/common/favicon_url.h"
|
| @@ -159,6 +160,11 @@ IPC_STRUCT_TRAITS_BEGIN(content::MenuItem)
|
| IPC_STRUCT_TRAITS_MEMBER(submenu)
|
| IPC_STRUCT_TRAITS_END()
|
|
|
| +IPC_STRUCT_TRAITS_BEGIN(content::ColorSuggestion)
|
| + IPC_STRUCT_TRAITS_MEMBER(color)
|
| + IPC_STRUCT_TRAITS_MEMBER(label)
|
| +IPC_STRUCT_TRAITS_END()
|
| +
|
| IPC_STRUCT_TRAITS_BEGIN(content::ContextMenuParams)
|
| IPC_STRUCT_TRAITS_MEMBER(media_type)
|
| IPC_STRUCT_TRAITS_MEMBER(x)
|
| @@ -1966,9 +1972,10 @@ IPC_MESSAGE_ROUTED1(ViewHostMsg_SelectionBoundsChanged,
|
| ViewHostMsg_SelectionBounds_Params)
|
|
|
| // Asks the browser to open the color chooser.
|
| -IPC_MESSAGE_ROUTED2(ViewHostMsg_OpenColorChooser,
|
| +IPC_MESSAGE_ROUTED3(ViewHostMsg_OpenColorChooser,
|
| int /* id */,
|
| - SkColor /* color */)
|
| + SkColor /* color */,
|
| + std::vector<content::ColorSuggestion> /* suggestions */)
|
|
|
| // Asks the browser to end the color chooser.
|
| IPC_MESSAGE_ROUTED1(ViewHostMsg_EndColorChooser, int /* id */)
|
|
|