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/content_client_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/content_client_qt.cpp')
| -rw-r--r-- | src/core/content_client_qt.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/core/content_client_qt.cpp b/src/core/content_client_qt.cpp index 66c63b1b8..a412345ea 100644 --- a/src/core/content_client_qt.cpp +++ b/src/core/content_client_qt.cpp @@ -263,11 +263,9 @@ void AddPepperWidevine(std::vector<content::PepperPluginInfo>* plugins) #endif // defined(USE_PROPRIETARY_CODECS) std::string codec_string = base::JoinString(codecs, ","); - widevine_cdm_mime_type.additional_param_names.push_back( - base::ASCIIToUTF16(kCdmSupportedCodecsParamName)); - widevine_cdm_mime_type.additional_param_values.push_back( - base::ASCIIToUTF16(codec_string)); - + widevine_cdm_mime_type.additional_params.emplace_back( + base::ASCIIToUTF16(kCdmSupportedCodecsParamName), + base::ASCIIToUTF16(codec_string)); widevine_cdm.mime_types.push_back(widevine_cdm_mime_type); widevine_cdm.permissions = kWidevineCdmPluginPermissions; plugins->push_back(widevine_cdm); @@ -300,12 +298,12 @@ std::string ContentClientQt::getUserAgent() } base::StringPiece ContentClientQt::GetDataResource(int resource_id, ui::ScaleFactor scale_factor) const { - return ResourceBundle::GetSharedInstance().GetRawDataResourceForScale(resource_id, scale_factor); + return ui::ResourceBundle::GetSharedInstance().GetRawDataResourceForScale(resource_id, scale_factor); } base::RefCountedMemory *ContentClientQt::GetDataResourceBytes(int resource_id) const { - return ResourceBundle::GetSharedInstance().LoadDataResourceBytes(resource_id); + return ui::ResourceBundle::GetSharedInstance().LoadDataResourceBytes(resource_id); } base::string16 ContentClientQt::GetLocalizedString(int message_id) const |