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

Unified Diff: media/base/media_switches.h

Issue 2428873002: Add about_flag for experimenting MediaSession on Desktop (Closed)
Patch Set: fixed cast_shell build Created 4 years, 2 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/browser/media/session/pepper_playback_observer.cc ('k') | media/base/media_switches.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/media_switches.h
diff --git a/media/base/media_switches.h b/media/base/media_switches.h
index b1ed8408301b2c182525387b7e42f72b56e8b2e2..d821025dbef96fa1c53ed6b387fbd772f7599382 100644
--- a/media/base/media_switches.h
+++ b/media/base/media_switches.h
@@ -43,9 +43,13 @@ MEDIA_EXPORT extern const char kWaveOutBuffers[];
MEDIA_EXPORT extern const char kUseCras[];
#endif
-#if !defined(OS_ANDROID)
+#if !defined(OS_ANDROID) || defined(ENABLE_PLUGINS)
MEDIA_EXPORT extern const char kEnableDefaultMediaSession[];
-#endif
+#endif // !defined(OS_ANDROID) || defined(ENABLE_PLUGINS)
+
+#if defined(ENABLE_PLUGINS)
+MEDIA_EXPORT extern const char kEnableDefaultMediaSessionWithFlash[];
+#endif // defined(ENABLE_PLUGINS)
MEDIA_EXPORT extern const char kUseFakeDeviceForMediaStream[];
MEDIA_EXPORT extern const char kUseFileForFakeVideoCapture[];
@@ -77,10 +81,6 @@ namespace media {
MEDIA_EXPORT extern const base::Feature kMediaFoundationH264Encoding;
#endif // defined(OS_WIN)
-#if defined(ENABLE_PLUGINS)
-MEDIA_EXPORT extern const base::Feature kFlashJoinsMediaSession;
-#endif // defined(ENABLE_PLUGINS)
-
MEDIA_EXPORT extern const base::Feature kNewAudioRenderingMixingStrategy;
MEDIA_EXPORT extern const base::Feature kOverlayFullscreenVideo;
MEDIA_EXPORT extern const base::Feature kResumeBackgroundVideo;
« no previous file with comments | « content/browser/media/session/pepper_playback_observer.cc ('k') | media/base/media_switches.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698