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/browser_message_filter_qt.cpp | |
| 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/browser_message_filter_qt.cpp')
| -rw-r--r-- | src/core/browser_message_filter_qt.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/core/browser_message_filter_qt.cpp b/src/core/browser_message_filter_qt.cpp index 5248c2a73..72b38e1bb 100644 --- a/src/core/browser_message_filter_qt.cpp +++ b/src/core/browser_message_filter_qt.cpp @@ -70,9 +70,8 @@ bool BrowserMessageFilterQt::OnMessageReceived(const IPC::Message& message) #if BUILDFLAG(ENABLE_LIBRARY_CDMS) void BrowserMessageFilterQt::OnIsInternalPluginAvailableForMimeType( - const std::string& mime_type, bool* is_available, - std::vector<base::string16>* additional_param_names, - std::vector<base::string16>* additional_param_values) + const std::string& mime_type, + base::Optional<std::vector<content::WebPluginMimeType::Param>> *opt_additional_params) { std::vector<content::WebPluginInfo> plugins; content::PluginService::GetInstance()->GetInternalPlugins(&plugins); @@ -82,15 +81,11 @@ void BrowserMessageFilterQt::OnIsInternalPluginAvailableForMimeType( const std::vector<content::WebPluginMimeType>& mime_types = plugin.mime_types; for (size_t j = 0; j < mime_types.size(); ++j) { if (mime_types[j].mime_type == mime_type) { - *is_available = true; - *additional_param_names = mime_types[j].additional_param_names; - *additional_param_values = mime_types[j].additional_param_values; + *opt_additional_params = base::make_optional(mime_types[j].additional_params); return; } } } - - *is_available = false; } #endif // BUILDFLAG(ENABLE_LIBRARY_CDMS) |