Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(580)

Unified Diff: media/blink/webmediaplayer_impl.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
« no previous file with comments | « content/renderer/media/webmediaplayer_ms_unittest.cc ('k') | media/blink/webmediaplayer_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/blink/webmediaplayer_impl.h
diff --git a/media/blink/webmediaplayer_impl.h b/media/blink/webmediaplayer_impl.h
index 73a1ce9e14c5591a87b77d9144a2cd9bd527d8b9..ffd9c220ed495d9cd90b111da4d2664d04e35e77 100644
--- a/media/blink/webmediaplayer_impl.h
+++ b/media/blink/webmediaplayer_impl.h
@@ -133,8 +133,8 @@ class MEDIA_BLINK_EXPORT WebMediaPlayerImpl
// Internal states of loading and network.
// TODO(hclam): Ask the pipeline about the state rather than having reading
// them from members which would cause race conditions.
- 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 didLoadingProgress() override;
« no previous file with comments | « content/renderer/media/webmediaplayer_ms_unittest.cc ('k') | media/blink/webmediaplayer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698