| Index: media/base/media_switches.cc
|
| diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc
|
| index 348792e43c271501a4b9010c5aeed41da8f6c44e..9ab2f04feb00774550f81f483c98f5c9ebc1202a 100644
|
| --- a/media/base/media_switches.cc
|
| +++ b/media/base/media_switches.cc
|
| @@ -135,6 +135,13 @@ const char kCastEncoderUtilHeuristic[] = "cast-encoder-util-heuristic";
|
|
|
| namespace media {
|
|
|
| +#if defined(ENABLE_PLUGINS)
|
| +// Let flash join and be controlled by media session, only valid when
|
| +// |kEnableDefaultMediaSession| is on.
|
| +const base::Feature kFlashJoinsMediaSession{"flash-join-media-session",
|
| + base::FEATURE_DISABLED_BY_DEFAULT};
|
| +#endif // defined(ENABLE_PLUGINS)
|
| +
|
| // Use new audio rendering mixer.
|
| const base::Feature kNewAudioRenderingMixingStrategy{
|
| "NewAudioRenderingMixingStrategy", base::FEATURE_DISABLED_BY_DEFAULT};
|
|
|