Index: content/common/view_messages.h |
diff --git a/content/common/view_messages.h b/content/common/view_messages.h |
index 4e5ebc5d9d11df03b30e340c088eed4c380e25e9..8d4d5cf9f03f1441e267bf955f6ec883c0500504 100644 |
--- a/content/common/view_messages.h |
+++ b/content/common/view_messages.h |
@@ -8,6 +8,7 @@ |
#include "base/process.h" |
#include "base/shared_memory.h" |
#include "base/string16.h" |
+#include "cc/input/top_controls_state.h" |
#include "cc/output/compositor_frame.h" |
#include "cc/output/compositor_frame_ack.h" |
#include "content/common/content_export.h" |
@@ -73,6 +74,7 @@ IPC_ENUM_TRAITS(WebKit::WebPopupType) |
IPC_ENUM_TRAITS(WebKit::WebTextDirection) |
IPC_ENUM_TRAITS(WebMenuItem::Type) |
IPC_ENUM_TRAITS(WindowContainerType) |
+IPC_ENUM_TRAITS(cc::TopControlsState) |
IPC_ENUM_TRAITS(content::FaviconURL::IconType) |
IPC_ENUM_TRAITS(content::FileChooserParams::Mode) |
IPC_ENUM_TRAITS(content::JavaScriptMessageType) |
@@ -1268,11 +1270,12 @@ IPC_MESSAGE_ROUTED0(ViewMsg_UndoScrollFocusedEditableNodeIntoView) |
IPC_MESSAGE_ROUTED1(ViewMsg_ImeBatchStateChanged, |
bool /* is_begin */) |
-// Notifies the renderer whether hiding/showing the top controls is enabled |
-// and whether or not to animate to the proper state. |
+// Notifies the renderer whether hiding/showing the top controls is enabled, |
+// what the current state should be, and whether or not to animate to the |
+// proper state. |
IPC_MESSAGE_ROUTED3(ViewMsg_UpdateTopControlsState, |
- bool /* enable_hiding */, |
- bool /* enable_showing */, |
+ cc::TopControlsState /* constraints */, |
+ cc::TopControlsState /* current */, |
bool /* animate */) |
IPC_MESSAGE_ROUTED0(ViewMsg_ShowImeIfNeeded) |
@@ -1418,6 +1421,11 @@ IPC_MESSAGE_ROUTED0(ViewHostMsg_UpdateScreenRects_ACK) |
IPC_MESSAGE_ROUTED1(ViewHostMsg_RequestMove, |
gfx::Rect /* position */) |
+// Sent by the renderer process to notify the browser that the web page has |
+// programmatically scrolled. |
+IPC_MESSAGE_ROUTED1(ViewHostMsg_DidProgrammaticallyScroll, |
+ gfx::Point /* scroll_point */) |
aelias_OOO_until_Jul13
2013/05/02 18:44:23
Let's change this to gfx::Vector2d (and likewise e
Michael van Ouwerkerk
2013/05/08 16:21:15
Done.
|
+ |
// Notifies the browser that a frame in the view has changed. This message |
// has a lot of parameters and is packed/unpacked by functions defined in |
// render_messages.h. |