Index: media/base/media_switches.cc |
diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc |
index f9ade75b07fe10ad0a4d0f10a925af69dc8e2892..e32d7fd40f1f3579c611e27e9a511f5571bdd1ea 100644 |
--- a/media/base/media_switches.cc |
+++ b/media/base/media_switches.cc |
@@ -71,7 +71,12 @@ const char kUseCras[] = "use-cras"; |
// each other. This is different from the Media Session API as it is enabling a |
// default behaviour for the browser. |
const char kEnableDefaultMediaSession[] = "enable-default-media-session"; |
xhwang
2016/10/18 17:26:59
Please add more comments about what the allowed va
Zhiqiang Zhang (Slow)
2016/10/18 18:51:54
Done.
|
-#endif |
+ |
+#if defined(ENABLE_PLUGINS) |
+const char kEnableDefaultMediaSessionWithFlash[] = "with-flash"; |
Alexei Svitkine (slow)
2016/10/18 16:51:38
Add a comment mentioning that this is the value fo
Zhiqiang Zhang (Slow)
2016/10/18 18:51:54
Done.
|
+#endif // defined(ENABLE_PLUGINS) |
+ |
+#endif // !defined(OS_ANDROID) |
// Use fake device for Media Stream to replace actual camera and microphone. |
const char kUseFakeDeviceForMediaStream[] = "use-fake-device-for-media-stream"; |
@@ -128,13 +133,6 @@ const base::Feature kMediaFoundationH264Encoding{ |
"MediaFoundationH264Encoding", base::FEATURE_DISABLED_BY_DEFAULT}; |
#endif // defined(OS_WIN) |
-#if defined(ENABLE_PLUGINS) |
-// Let flash join and be controlled by media session, only valid when |
-// |kEnableDefaultMediaSession| is on. |
-const base::Feature kFlashJoinsMediaSession{"FlashJoinsMediaSession", |
- base::FEATURE_DISABLED_BY_DEFAULT}; |
-#endif // defined(ENABLE_PLUGINS) |
- |
// Use new audio rendering mixer. |
const base::Feature kNewAudioRenderingMixingStrategy{ |
"NewAudioRenderingMixingStrategy", base::FEATURE_DISABLED_BY_DEFAULT}; |