| Index: content/common/frame_messages.h
|
| diff --git a/content/common/frame_messages.h b/content/common/frame_messages.h
|
| index 38cd6baf033c0668cc77a0e587fdbcd611934b14..4e6eafaf08caf986d4e174cbfd35dc4063b5687d 100644
|
| --- a/content/common/frame_messages.h
|
| +++ b/content/common/frame_messages.h
|
| @@ -22,6 +22,7 @@
|
| #include "content/public/common/resource_response.h"
|
| #include "content/public/common/transition_element.h"
|
| #include "ipc/ipc_message_macros.h"
|
| +#include "third_party/WebKit/public/web/WebHistoryCommitType.h"
|
| #include "ui/gfx/ipc/gfx_param_traits.h"
|
| #include "url/gurl.h"
|
| #include "url/origin.h"
|
| @@ -37,6 +38,9 @@ IPC_ENUM_TRAITS_MIN_MAX_VALUE(AccessibilityMode,
|
| IPC_ENUM_TRAITS_MIN_MAX_VALUE(content::JavaScriptMessageType,
|
| content::JAVASCRIPT_MESSAGE_TYPE_ALERT,
|
| content::JAVASCRIPT_MESSAGE_TYPE_PROMPT)
|
| +IPC_ENUM_TRAITS_MIN_MAX_VALUE(blink::WebHistoryCommitType,
|
| + blink::WebStandardCommit,
|
| + blink::WebHistoryInertCommit)
|
| IPC_ENUM_TRAITS_MAX_VALUE(FrameMsg_Navigate_Type::Value,
|
| FrameMsg_Navigate_Type::NAVIGATE_TYPE_LAST)
|
| IPC_ENUM_TRAITS_MAX_VALUE(FrameMsg_UILoadMetricsReportType::Value,
|
| @@ -122,6 +126,7 @@ IPC_STRUCT_END()
|
|
|
| IPC_STRUCT_TRAITS_BEGIN(content::FrameNavigateParams)
|
| IPC_STRUCT_TRAITS_MEMBER(page_id)
|
| + IPC_STRUCT_TRAITS_MEMBER(nav_entry_id)
|
| IPC_STRUCT_TRAITS_MEMBER(url)
|
| IPC_STRUCT_TRAITS_MEMBER(base_url)
|
| IPC_STRUCT_TRAITS_MEMBER(referrer)
|
| @@ -140,6 +145,10 @@ IPC_STRUCT_BEGIN_WITH_PARENT(FrameHostMsg_DidCommitProvisionalLoad_Params,
|
| content::FrameNavigateParams)
|
| IPC_STRUCT_TRAITS_PARENT(content::FrameNavigateParams)
|
|
|
| + // The type of commit. TODO(avi): Does this need to go in FrameNavigateParams,
|
| + // instead?
|
| + IPC_STRUCT_MEMBER(blink::WebHistoryCommitType, commit_type)
|
| +
|
| // Information regarding the security of the connection (empty if the
|
| // connection was not secure).
|
| IPC_STRUCT_MEMBER(std::string, security_info)
|
| @@ -235,6 +244,7 @@ IPC_STRUCT_TRAITS_END()
|
| IPC_STRUCT_TRAITS_BEGIN(content::HistoryNavigationParams)
|
| IPC_STRUCT_TRAITS_MEMBER(page_state)
|
| IPC_STRUCT_TRAITS_MEMBER(page_id)
|
| + IPC_STRUCT_TRAITS_MEMBER(nav_entry_id)
|
| IPC_STRUCT_TRAITS_MEMBER(pending_history_list_offset)
|
| IPC_STRUCT_TRAITS_MEMBER(current_history_list_offset)
|
| IPC_STRUCT_TRAITS_MEMBER(current_history_list_length)
|
|
|