diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-01-30 17:23:41 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-03-15 16:52:17 +0000 |
| commit | d5bffb5125da23718e8098441b4a4269a5cf2f33 (patch) | |
| tree | 48a39ba7f833116cba7dcc7917d13d34a062949c /src/core/common | |
| parent | 789f375411b542db3ac3be79cbe0a6153720abf1 (diff) | |
Basic adaptations for 64-based
Change-Id: I11e2da206e4e59872a38c178f57a5879c1bbf229
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'src/core/common')
| -rw-r--r-- | src/core/common/qt_messages.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/core/common/qt_messages.h b/src/core/common/qt_messages.h index 3bedb10d2..62d88521c 100644 --- a/src/core/common/qt_messages.h +++ b/src/core/common/qt_messages.h @@ -4,11 +4,12 @@ // Multiply-included file, no traditional include guard. +#include "base/optional.h" #include "media/media_features.h" #include "content/public/common/common_param_traits.h" +#include "content/public/common/webplugininfo.h" #include "ipc/ipc_message_macros.h" #include "ppapi/features/features.h" - #include "user_script_data.h" IPC_STRUCT_TRAITS_BEGIN(UserScriptData) @@ -81,9 +82,7 @@ IPC_MESSAGE_ROUTED1(WebChannelIPCTransportHost_SendMessage, std::vector<char> /* // When the returned *|is_available| is true, |additional_param_names| and // |additional_param_values| contain the name-value pairs, if any, specified // for the *first* non-disabled plugin found that is registered for |mime_type|. -IPC_SYNC_MESSAGE_CONTROL1_3(QtWebEngineHostMsg_IsInternalPluginAvailableForMimeType, +IPC_SYNC_MESSAGE_CONTROL1_1(QtWebEngineHostMsg_IsInternalPluginAvailableForMimeType, std::string /* mime_type */, - bool /* is_available */, - std::vector<base::string16> /* additional_param_names */, - std::vector<base::string16> /* additional_param_values */) + base::Optional<std::vector<content::WebPluginMimeType::Param>>) #endif |