OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "media/blink/webmediaplayer_util.h" | 5 #include "media/blink/webmediaplayer_util.h" |
6 | 6 |
7 #include <math.h> | 7 #include <math.h> |
| 8 #include <stddef.h> |
8 #include <string> | 9 #include <string> |
9 | 10 |
10 #include "base/metrics/histogram.h" | 11 #include "base/metrics/histogram.h" |
11 #include "media/base/bind_to_current_loop.h" | 12 #include "media/base/bind_to_current_loop.h" |
12 #include "media/base/media_client.h" | 13 #include "media/base/media_client.h" |
13 #include "media/base/media_keys.h" | 14 #include "media/base/media_keys.h" |
14 #include "third_party/WebKit/public/platform/WebMediaPlayerEncryptedMediaClient.
h" | 15 #include "third_party/WebKit/public/platform/WebMediaPlayerEncryptedMediaClient.
h" |
15 | 16 |
16 namespace media { | 17 namespace media { |
17 | 18 |
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
234 | 235 |
235 } // namespace | 236 } // namespace |
236 | 237 |
237 SwitchOutputDeviceCB ConvertToSwitchOutputDeviceCB( | 238 SwitchOutputDeviceCB ConvertToSwitchOutputDeviceCB( |
238 blink::WebSetSinkIdCallbacks* web_callbacks) { | 239 blink::WebSetSinkIdCallbacks* web_callbacks) { |
239 return media::BindToCurrentLoop( | 240 return media::BindToCurrentLoop( |
240 base::Bind(RunSetSinkIdCallback, SetSinkIdCallback(web_callbacks))); | 241 base::Bind(RunSetSinkIdCallback, SetSinkIdCallback(web_callbacks))); |
241 } | 242 } |
242 | 243 |
243 } // namespace media | 244 } // namespace media |
OLD | NEW |