| Index: content/common/view_messages.h
|
| diff --git a/content/common/view_messages.h b/content/common/view_messages.h
|
| index 250fe371abaebbd8ad777f5b4738219c70c5aa1c..e13ff187b014ac27c3f884d28320b756550acefc 100644
|
| --- a/content/common/view_messages.h
|
| +++ b/content/common/view_messages.h
|
| @@ -22,6 +22,7 @@
|
| #include "content/public/common/file_chooser_params.h"
|
| #include "content/public/common/frame_navigate_params.h"
|
| #include "content/public/common/javascript_message_type.h"
|
| +#include "content/public/common/page_state.h"
|
| #include "content/public/common/page_zoom.h"
|
| #include "content/public/common/referrer.h"
|
| #include "content/public/common/renderer_preferences.h"
|
| @@ -162,7 +163,7 @@ IPC_STRUCT_TRAITS_BEGIN(content::ContextMenuParams)
|
| IPC_STRUCT_TRAITS_MEMBER(page_url)
|
| IPC_STRUCT_TRAITS_MEMBER(keyword_url)
|
| IPC_STRUCT_TRAITS_MEMBER(frame_url)
|
| - IPC_STRUCT_TRAITS_MEMBER(frame_content_state)
|
| + IPC_STRUCT_TRAITS_MEMBER(frame_page_state)
|
| IPC_STRUCT_TRAITS_MEMBER(media_flags)
|
| IPC_STRUCT_TRAITS_MEMBER(selection_text)
|
| IPC_STRUCT_TRAITS_MEMBER(misspelled_word)
|
| @@ -416,7 +417,7 @@ IPC_STRUCT_BEGIN_WITH_PARENT(ViewHostMsg_FrameNavigate_Params,
|
| IPC_STRUCT_MEMBER(bool, was_fetched_via_proxy)
|
|
|
| // Serialized history item state to store in the navigation entry.
|
| - IPC_STRUCT_MEMBER(std::string, content_state)
|
| + IPC_STRUCT_MEMBER(content::PageState, page_state)
|
|
|
| // Original request's URL.
|
| IPC_STRUCT_MEMBER(GURL, original_request_url)
|
| @@ -602,7 +603,7 @@ IPC_STRUCT_BEGIN(ViewMsg_Navigate_Params)
|
| IPC_STRUCT_MEMBER(content::PageTransition, transition)
|
|
|
| // Opaque history state (received by ViewHostMsg_UpdateState).
|
| - IPC_STRUCT_MEMBER(std::string, state)
|
| + IPC_STRUCT_MEMBER(content::PageState, page_state)
|
|
|
| // Type of navigation.
|
| IPC_STRUCT_MEMBER(ViewMsg_Navigate_Type::Value, navigation_type)
|
| @@ -1490,7 +1491,7 @@ IPC_MESSAGE_ROUTED4(ViewHostMsg_MediaNotification,
|
| // page_id: unique ID that allows us to distinguish between history entries.
|
| IPC_MESSAGE_ROUTED2(ViewHostMsg_UpdateState,
|
| int32 /* page_id */,
|
| - std::string /* state */)
|
| + content::PageState /* state */)
|
|
|
| // Notifies the browser that a document has been loaded in a frame.
|
| IPC_MESSAGE_ROUTED1(ViewHostMsg_DocumentLoadedInFrame,
|
|
|