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

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

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

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

index a66115062cb538514ae11e14e8c4372cb71e6bd6..12f56c332de3f404371072de12dc5fcd14b02bb0 100644

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

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

@@ -162,8 +162,8 @@ class WebMediaPlayerAndroid

bool didLoadingProgress() override;

// Internal states of loading and network.

- blink::WebMediaPlayer::NetworkState networkState() const override;

- blink::WebMediaPlayer::ReadyState readyState() const override;

+ blink::WebMediaPlayer::NetworkState getNetworkState() const override;

+ blink::WebMediaPlayer::ReadyState getReadyState() const override;

bool hasSingleSecurityOrigin() const override;

bool didPassCORSAccessCheck() const override;

« no previous file with comments | « no previous file | content/renderer/media/android/webmediaplayer_android.cc » ('j') | no next file with comments »