| 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 #include "build/build_config.h" | 5 #include "build/build_config.h" |
| 6 #include "media/base/media_switches.h" | 6 #include "media/base/media_switches.h" |
| 7 #include "ppapi/features/features.h" | 7 #include "ppapi/features/features.h" |
| 8 | 8 |
| 9 namespace switches { | 9 namespace switches { |
| 10 | 10 |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 57 | 57 |
| 58 // Number of buffers to use for WaveOut. | 58 // Number of buffers to use for WaveOut. |
| 59 const char kWaveOutBuffers[] = "waveout-buffers"; | 59 const char kWaveOutBuffers[] = "waveout-buffers"; |
| 60 #endif | 60 #endif |
| 61 | 61 |
| 62 #if defined(USE_CRAS) | 62 #if defined(USE_CRAS) |
| 63 // Use CRAS, the ChromeOS audio server. | 63 // Use CRAS, the ChromeOS audio server. |
| 64 const char kUseCras[] = "use-cras"; | 64 const char kUseCras[] = "use-cras"; |
| 65 #endif | 65 #endif |
| 66 | 66 |
| 67 #if defined(OS_ANDROID) |
| 68 const char kDisableInfobarForProtectedMediaIdentifierForLocalhost[] = |
| 69 "disable-infobar-for-protected-media-identifier-for-localhost"; |
| 70 #endif |
| 71 |
| 67 #if !defined(OS_ANDROID) || BUILDFLAG(ENABLE_PLUGINS) | 72 #if !defined(OS_ANDROID) || BUILDFLAG(ENABLE_PLUGINS) |
| 68 // Use a media session for each tabs in a way that two tabs can't play on top of | 73 // Use a media session for each tabs in a way that two tabs can't play on top of |
| 69 // each other. This is different from the Media Session API as it is enabling a | 74 // each other. This is different from the Media Session API as it is enabling a |
| 70 // default behaviour for the browser. The allowed values are: "" (empty), | 75 // default behaviour for the browser. The allowed values are: "" (empty), |
| 71 // |kEnableDefaultMediaSessionDuckFlash|. | 76 // |kEnableDefaultMediaSessionDuckFlash|. |
| 72 const char kEnableDefaultMediaSession[] = "enable-default-media-session"; | 77 const char kEnableDefaultMediaSession[] = "enable-default-media-session"; |
| 73 #endif // !defined(OS_ANDROID) || BUILDFLAG(ENABLE_PLUGINS) | 78 #endif // !defined(OS_ANDROID) || BUILDFLAG(ENABLE_PLUGINS) |
| 74 | 79 |
| 75 #if BUILDFLAG(ENABLE_PLUGINS) | 80 #if BUILDFLAG(ENABLE_PLUGINS) |
| 76 // This value is used as an option for |kEnableDefaultMediaSession|. Flash will | 81 // This value is used as an option for |kEnableDefaultMediaSession|. Flash will |
| (...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 204 | 209 |
| 205 // An experimental feature to enable persistent-license type support in MediaDrm | 210 // An experimental feature to enable persistent-license type support in MediaDrm |
| 206 // when using Encrypted Media Extensions (EME) API. | 211 // when using Encrypted Media Extensions (EME) API. |
| 207 // TODO(xhwang): Remove this after feature launch. See http://crbug.com/493521 | 212 // TODO(xhwang): Remove this after feature launch. See http://crbug.com/493521 |
| 208 const base::Feature kMediaDrmPersistentLicense{ | 213 const base::Feature kMediaDrmPersistentLicense{ |
| 209 "MediaDrmPersistentLicense", base::FEATURE_DISABLED_BY_DEFAULT}; | 214 "MediaDrmPersistentLicense", base::FEATURE_DISABLED_BY_DEFAULT}; |
| 210 | 215 |
| 211 #endif | 216 #endif |
| 212 | 217 |
| 213 } // namespace media | 218 } // namespace media |
| OLD | NEW |