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

Side by Side Diff: media/base/media_switches.cc

Issue 2816773002: Added switch for bypassing protected media identifier permission (Closed)
Patch Set: Added switch for bypassing permissions Created 3 years, 7 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 unified diff | Download patch
OLDNEW
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
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 // For automated testing of protected content, this switch will allow specific
68 // domains to bypass the protected media identifier request prompt. This flag
xhwang 2017/05/04 19:57:37 nit: s/request/permission
Vaage 2017/05/04 21:41:20 Done.
69 // will have no effect if user-data-dir is not enabled.
Joey Parrish 2017/05/04 18:04:35 nit: "set", rather than "enabled". user-data-dir
Vaage 2017/05/04 18:06:15 Done.
xhwang 2017/05/04 19:57:38 Please add an example how to use this, something s
Vaage 2017/05/04 21:41:20 Done.
70 const char kDisableInfobarForProtectedMediaIdentifierForDomain[] =
71 "disable-infobar-for-protected-media-identifier-for-domain";
72
67 #if !defined(OS_ANDROID) || BUILDFLAG(ENABLE_PLUGINS) 73 #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 74 // 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 75 // 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), 76 // default behaviour for the browser. The allowed values are: "" (empty),
71 // |kEnableDefaultMediaSessionDuckFlash|. 77 // |kEnableDefaultMediaSessionDuckFlash|.
72 const char kEnableDefaultMediaSession[] = "enable-default-media-session"; 78 const char kEnableDefaultMediaSession[] = "enable-default-media-session";
73 #endif // !defined(OS_ANDROID) || BUILDFLAG(ENABLE_PLUGINS) 79 #endif // !defined(OS_ANDROID) || BUILDFLAG(ENABLE_PLUGINS)
74 80
75 #if BUILDFLAG(ENABLE_PLUGINS) 81 #if BUILDFLAG(ENABLE_PLUGINS)
76 // This value is used as an option for |kEnableDefaultMediaSession|. Flash will 82 // This value is used as an option for |kEnableDefaultMediaSession|. Flash will
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 210
205 // An experimental feature to enable persistent-license type support in MediaDrm 211 // An experimental feature to enable persistent-license type support in MediaDrm
206 // when using Encrypted Media Extensions (EME) API. 212 // when using Encrypted Media Extensions (EME) API.
207 // TODO(xhwang): Remove this after feature launch. See http://crbug.com/493521 213 // TODO(xhwang): Remove this after feature launch. See http://crbug.com/493521
208 const base::Feature kMediaDrmPersistentLicense{ 214 const base::Feature kMediaDrmPersistentLicense{
209 "MediaDrmPersistentLicense", base::FEATURE_DISABLED_BY_DEFAULT}; 215 "MediaDrmPersistentLicense", base::FEATURE_DISABLED_BY_DEFAULT};
210 216
211 #endif 217 #endif
212 218
213 } // namespace media 219 } // namespace media
OLDNEW
« chrome/browser/ui/startup/bad_flags_prompt.cc ('K') | « media/base/media_switches.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698