| Index: content/common/frame_messages.h
|
| diff --git a/content/common/frame_messages.h b/content/common/frame_messages.h
|
| index aebe97582a5bcbc7bf8ec4bc6a735c80c8dd4bfa..041a80fd0c01182196a55a5822124b8f16a1cd61 100644
|
| --- a/content/common/frame_messages.h
|
| +++ b/content/common/frame_messages.h
|
| @@ -48,6 +48,7 @@
|
| #include "content/public/common/three_d_api_types.h"
|
| #include "ipc/ipc_message_macros.h"
|
| #include "ipc/ipc_platform_file.h"
|
| +#include "mojo/public/cpp/system/message_pipe.h"
|
| #include "ppapi/features/features.h"
|
| #include "third_party/WebKit/public/platform/WebFeaturePolicy.h"
|
| #include "third_party/WebKit/public/platform/WebFocusType.h"
|
| @@ -626,6 +627,11 @@ IPC_STRUCT_BEGIN(FrameMsg_MixedContentFound_Params)
|
| IPC_STRUCT_MEMBER(content::SourceLocation, source_location)
|
| IPC_STRUCT_END()
|
|
|
| +IPC_STRUCT_BEGIN(FrameMsg_CommitDataNetworkService_Params)
|
| + IPC_STRUCT_MEMBER(mojo::DataPipeConsumerHandle, handle)
|
| + IPC_STRUCT_MEMBER(mojo::MessagePipeHandle, url_loader_factory)
|
| +IPC_STRUCT_END()
|
| +
|
| #if BUILDFLAG(USE_EXTERNAL_POPUP_MENU)
|
| // This message is used for supporting popup menus on Mac OS X and Android using
|
| // native controls. See the FrameHostMsg_ShowPopup message.
|
| @@ -913,11 +919,13 @@ IPC_MESSAGE_ROUTED2(FrameMsg_SelectPopupMenuItems,
|
| // Tells the renderer that a navigation is ready to commit. The renderer should
|
| // request |stream_url| to get access to the stream containing the body of the
|
| // response. When --enable-network-service is in effect, |stream_url| is not
|
| -// used, and instead the data is passed to the renderer in |handle|.
|
| +// used, and instead the data is passed to the renderer in |commit_data.handle|.
|
| +// When --enable-network-service, a URLLoaderFactory is optionally passed in
|
| +// |commit_data| too.
|
| IPC_MESSAGE_ROUTED5(FrameMsg_CommitNavigation,
|
| - content::ResourceResponseHead, /* response */
|
| - GURL, /* stream_url */
|
| - mojo::DataPipeConsumerHandle, /* handle */
|
| + content::ResourceResponseHead, /* response */
|
| + GURL, /* stream_url */
|
| + FrameMsg_CommitDataNetworkService_Params, /* commit_data */
|
| content::CommonNavigationParams, /* common_params */
|
| content::RequestNavigationParams /* request_params */)
|
|
|
|
|