content/renderer/media/android/webmediaplayer_android.cc - Issue 1740483004: Rename enums/functions that collide in chromium style in core/html/.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/renderer/media/android/webmediaplayer_android.cc

Issue 1740483004: Rename enums/functions that collide in chromium style in core/html/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@get-names-5

Patch Set: get-names-6: . Created 4 years, 10 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/renderer/media/android/webmediaplayer_android.h ('k') | content/renderer/media/html_video_element_capturer_source_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/media/android/webmediaplayer_android.cc

diff --git a/content/renderer/media/android/webmediaplayer_android.cc b/content/renderer/media/android/webmediaplayer_android.cc

index 059e96f580aefb94ae56d870a2acdd12869bfb93..a0096d519bf3398bf67d23f443cef737b5460031 100644

--- a/content/renderer/media/android/webmediaplayer_android.cc

+++ b/content/renderer/media/android/webmediaplayer_android.cc

@@ -605,11 +605,11 @@ WebSize WebMediaPlayerAndroid::naturalSize() const {

return natural_size_;

}

-WebMediaPlayer::NetworkState WebMediaPlayerAndroid::networkState() const {

+WebMediaPlayer::NetworkState WebMediaPlayerAndroid::getNetworkState() const {

return network_state_;

}

-WebMediaPlayer::ReadyState WebMediaPlayerAndroid::readyState() const {

+WebMediaPlayer::ReadyState WebMediaPlayerAndroid::getReadyState() const {

return ready_state_;

}