diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-07-14 17:41:05 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-08-04 12:37:36 +0000 |
| commit | 399c965b6064c440ddcf4015f5f8e9d131c7a0a6 (patch) | |
| tree | 6b06b60ff365abef0e13b3503d593a0df48d20e8 /chromium/content/renderer/media/render_media_client.h | |
| parent | 7366110654eec46f21b6824f302356426f48cd74 (diff) | |
| download | qtwebengine-chromium-399c965b6064c440ddcf4015f5f8e9d131c7a0a6.tar.gz | |
BASELINE: Update Chromium to 52.0.2743.76 and Ninja to 1.7.1
Change-Id: I382f51b959689505a60f8b707255ecb344f7d8b4
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/content/renderer/media/render_media_client.h')
| -rw-r--r-- | chromium/content/renderer/media/render_media_client.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chromium/content/renderer/media/render_media_client.h b/chromium/content/renderer/media/render_media_client.h index a0ad2efe3a6..1d5d3457a12 100644 --- a/chromium/content/renderer/media/render_media_client.h +++ b/chromium/content/renderer/media/render_media_client.h @@ -29,7 +29,8 @@ class CONTENT_EXPORT RenderMediaClient : public media::MediaClient { std::vector<media::KeySystemInfoForUMA>* key_systems_info_for_uma) final; bool IsKeySystemsUpdateNeeded() final; void AddSupportedKeySystems( - std::vector<media::KeySystemInfo>* key_systems_info) final; + std::vector<std::unique_ptr<media::KeySystemProperties>>* + key_systems_properties) final; void RecordRapporURL(const std::string& metric, const GURL& url) final; void SetTickClockForTesting(std::unique_ptr<base::TickClock> tick_clock); |