| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 // Defines all the "media" command-line switches. | 5 // Defines all the "media" command-line switches. |
| 6 | 6 |
| 7 #ifndef MEDIA_BASE_MEDIA_SWITCHES_H_ | 7 #ifndef MEDIA_BASE_MEDIA_SWITCHES_H_ |
| 8 #define MEDIA_BASE_MEDIA_SWITCHES_H_ | 8 #define MEDIA_BASE_MEDIA_SWITCHES_H_ |
| 9 | 9 |
| 10 #include "base/feature_list.h" | 10 #include "base/feature_list.h" |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 66 MEDIA_EXPORT extern const char kEnableVp9InMp4[]; | 66 MEDIA_EXPORT extern const char kEnableVp9InMp4[]; |
| 67 | 67 |
| 68 MEDIA_EXPORT extern const char kCastEncoderUtilHeuristic[]; | 68 MEDIA_EXPORT extern const char kCastEncoderUtilHeuristic[]; |
| 69 | 69 |
| 70 } // namespace switches | 70 } // namespace switches |
| 71 | 71 |
| 72 namespace media { | 72 namespace media { |
| 73 | 73 |
| 74 // All features in alphabetical order. The features should be documented | 74 // All features in alphabetical order. The features should be documented |
| 75 // alongside the definition of their values in the .cc file. | 75 // alongside the definition of their values in the .cc file. |
| 76 |
| 77 #if defined(ENABLE_PLUGINS) |
| 78 MEDIA_EXPORT extern const base::Feature kFlashJoinsMediaSession; |
| 79 #endif // defined(ENABLE_PLUGINS) |
| 80 |
| 76 MEDIA_EXPORT extern const base::Feature kNewAudioRenderingMixingStrategy; | 81 MEDIA_EXPORT extern const base::Feature kNewAudioRenderingMixingStrategy; |
| 77 MEDIA_EXPORT extern const base::Feature kUseNewMediaCache; | 82 MEDIA_EXPORT extern const base::Feature kUseNewMediaCache; |
| 78 | 83 |
| 79 } // namespace media | 84 } // namespace media |
| 80 | 85 |
| 81 #endif // MEDIA_BASE_MEDIA_SWITCHES_H_ | 86 #endif // MEDIA_BASE_MEDIA_SWITCHES_H_ |
| OLD | NEW |