webkit/media/android/webmediaplayer_android.cc - Issue 15462003: Update references to Blink's Platform API headers

Side by Side Diff: webkit/media/android/webmediaplayer_android.cc

Issue 15462003: Update references to Blink's Platform API headers (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 7 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 | « webkit/media/android/webmediaplayer_android.h ('k') | webkit/media/audio_decoder.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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 "webkit/media/android/webmediaplayer_android.h"	5 #include "webkit/media/android/webmediaplayer_android.h"

6	6

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

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

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

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

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

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

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

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

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

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

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

18 #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h"	18 #include "third_party/WebKit/public/platform/WebString.h"

19 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"	19 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"

20 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"	20 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"

21 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayerClient. h"	21 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayerClient. h"

22 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaSource.h"	22 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaSource.h"

23 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"	23 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"

24 #include "webkit/media/android/media_source_delegate.h"	24 #include "webkit/media/android/media_source_delegate.h"

25 #include "webkit/media/android/webmediaplayer_manager_android.h"	25 #include "webkit/media/android/webmediaplayer_manager_android.h"

26 #include "webkit/media/android/webmediaplayer_proxy_android.h"	26 #include "webkit/media/android/webmediaplayer_proxy_android.h"

27 #include "webkit/media/webmediaplayer_util.h"	27 #include "webkit/media/webmediaplayer_util.h"

28 #include "webkit/renderer/compositor_bindings/web_layer_impl.h"	28 #include "webkit/renderer/compositor_bindings/web_layer_impl.h"

(...skipping 661 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
690 void WebMediaPlayerAndroid::exitFullscreen() {	690 void WebMediaPlayerAndroid::exitFullscreen() {

691 if (proxy_)	691 if (proxy_)

692 proxy_->ExitFullscreen(player_id_);	692 proxy_->ExitFullscreen(player_id_);

693 }	693 }

694	694

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

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

697 }	697 }

698	698

699 } // namespace webkit_media	699 } // namespace webkit_media

OLD	NEW