content/renderer/media/android/webmediaplayer_android.cc - Issue 132163006: Rename media/base/bind_to_loop.h to media/base/bind_to_current_loop.h.

Side by Side Diff: content/renderer/media/android/webmediaplayer_android.cc

Issue 132163006: Rename media/base/bind_to_loop.h to media/base/bind_to_current_loop.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « content/renderer/media/android/media_source_delegate.cc ('k') | content/renderer/media/rtc_video_decoder.cc » ('j') | media/base/bind_to_current_loop_unittest.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 "content/renderer/media/android/webmediaplayer_android.h"	5 #include "content/renderer/media/android/webmediaplayer_android.h"

6	6

7 #include <limits>	7 #include <limits>

8	8

9 #include "base/bind.h"	9 #include "base/bind.h"

10 #include "base/command_line.h"	10 #include "base/command_line.h"

11 #include "base/files/file_path.h"	11 #include "base/files/file_path.h"

12 #include "base/logging.h"	12 #include "base/logging.h"

13 #include "base/metrics/histogram.h"	13 #include "base/metrics/histogram.h"

14 #include "base/strings/string_number_conversions.h"	14 #include "base/strings/string_number_conversions.h"

15 #include "cc/layers/video_layer.h"	15 #include "cc/layers/video_layer.h"

16 #include "content/public/common/content_client.h"	16 #include "content/public/common/content_client.h"

17 #include "content/renderer/media/android/proxy_media_keys.h"	17 #include "content/renderer/media/android/proxy_media_keys.h"

18 #include "content/renderer/media/android/renderer_demuxer_android.h"	18 #include "content/renderer/media/android/renderer_demuxer_android.h"

19 #include "content/renderer/media/android/renderer_media_player_manager.h"	19 #include "content/renderer/media/android/renderer_media_player_manager.h"

20 #include "content/renderer/media/crypto/key_systems.h"	20 #include "content/renderer/media/crypto/key_systems.h"

21 #include "content/renderer/media/webmediaplayer_delegate.h"	21 #include "content/renderer/media/webmediaplayer_delegate.h"

22 #include "content/renderer/media/webmediaplayer_util.h"	22 #include "content/renderer/media/webmediaplayer_util.h"

23 #include "content/renderer/render_thread_impl.h"	23 #include "content/renderer/render_thread_impl.h"

24 #include "gpu/GLES2/gl2extchromium.h"	24 #include "gpu/GLES2/gl2extchromium.h"

25 #include "grit/content_resources.h"	25 #include "grit/content_resources.h"

26 #include "media/base/android/media_player_android.h"	26 #include "media/base/android/media_player_android.h"

27 #include "media/base/bind_to_loop.h"	27 #include "media/base/bind_to_current_loop.h"

28 #include "media/base/media_switches.h"	28 #include "media/base/media_switches.h"

29 #include "media/base/video_frame.h"	29 #include "media/base/video_frame.h"

30 #include "net/base/mime_util.h"	30 #include "net/base/mime_util.h"

31 #include "third_party/WebKit/public/platform/WebMediaPlayerClient.h"	31 #include "third_party/WebKit/public/platform/WebMediaPlayerClient.h"

32 #include "third_party/WebKit/public/platform/WebString.h"	32 #include "third_party/WebKit/public/platform/WebString.h"

33 #include "third_party/WebKit/public/web/WebDocument.h"	33 #include "third_party/WebKit/public/web/WebDocument.h"

34 #include "third_party/WebKit/public/web/WebFrame.h"	34 #include "third_party/WebKit/public/web/WebFrame.h"

35 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h"	35 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h"

36 #include "third_party/WebKit/public/web/WebView.h"	36 #include "third_party/WebKit/public/web/WebView.h"

37 #include "third_party/skia/include/core/SkBitmap.h"	37 #include "third_party/skia/include/core/SkBitmap.h"

(...skipping 1424 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1462	1462

1463 void WebMediaPlayerAndroid::exitFullscreen() {	1463 void WebMediaPlayerAndroid::exitFullscreen() {

1464 manager_->ExitFullscreen(player_id_);	1464 manager_->ExitFullscreen(player_id_);

1465 }	1465 }

1466	1466

1467 bool WebMediaPlayerAndroid::canEnterFullscreen() const {	1467 bool WebMediaPlayerAndroid::canEnterFullscreen() const {

1468 return manager_->CanEnterFullscreen(frame_);	1468 return manager_->CanEnterFullscreen(frame_);

1469 }	1469 }

1470	1470

1471 } // namespace content	1471 } // namespace content

OLD	NEW