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

Side by Side Diff: content/public/common/content_switches.cc

Issue 865793003: Replace "enable-encrypted-media" flag with "disable-encrypted-media". (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Restore old value to histograms.xml Created 5 years, 11 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
« no previous file with comments | « content/public/common/content_switches.h ('k') | mojo/services/html_viewer/html_viewer.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "content/public/common/content_switches.h" 5 #include "content/public/common/content_switches.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/metrics/field_trial.h" 8 #include "base/metrics/field_trial.h"
9 9
10 namespace switches { 10 namespace switches {
(...skipping 293 matching lines...) Expand 10 before | Expand all | Expand 10 after
304 // 1. Enable: allow browser to use display list for 2d canvas (browser makes 304 // 1. Enable: allow browser to use display list for 2d canvas (browser makes
305 // decision). 305 // decision).
306 // 2. Force: browser always uses display list for 2d canvas. 306 // 2. Force: browser always uses display list for 2d canvas.
307 const char kEnableDisplayList2dCanvas[] = "enable-display-list-2d-canvas"; 307 const char kEnableDisplayList2dCanvas[] = "enable-display-list-2d-canvas";
308 const char kForceDisplayList2dCanvas[] = "force-display-list-2d-canvas"; 308 const char kForceDisplayList2dCanvas[] = "force-display-list-2d-canvas";
309 const char kDisableDisplayList2dCanvas[] = "disable-display-list-2d-canvas"; 309 const char kDisableDisplayList2dCanvas[] = "disable-display-list-2d-canvas";
310 310
311 // Enables restarting interrupted downloads. 311 // Enables restarting interrupted downloads.
312 const char kEnableDownloadResumption[] = "enable-download-resumption"; 312 const char kEnableDownloadResumption[] = "enable-download-resumption";
313 313
314 // Enables support for Encrypted Media Extensions (e.g. MediaKeys). 314 // Disables (unprefixed) Encrypted Media Extensions.
315 const char kEnableEncryptedMedia[] = "enable-encrypted-media"; 315 const char kDisableEncryptedMedia[] = "disable-encrypted-media";
316 316
317 // Enable experimental canvas features, e.g. canvas 2D context attributes 317 // Enable experimental canvas features, e.g. canvas 2D context attributes
318 const char kEnableExperimentalCanvasFeatures[] = 318 const char kEnableExperimentalCanvasFeatures[] =
319 "enable-experimental-canvas-features"; 319 "enable-experimental-canvas-features";
320 320
321 // Enables Web Platform features that are in development. 321 // Enables Web Platform features that are in development.
322 const char kEnableExperimentalWebPlatformFeatures[] = 322 const char kEnableExperimentalWebPlatformFeatures[] =
323 "enable-experimental-web-platform-features"; 323 "enable-experimental-web-platform-features";
324 324
325 // By default, cookies are not allowed on file://. They are needed for testing, 325 // By default, cookies are not allowed on file://. They are needed for testing,
(...skipping 642 matching lines...) Expand 10 before | Expand all | Expand 10 after
968 if (cmd_line->HasSwitch(kDisableWin32kRendererLockDown)) 968 if (cmd_line->HasSwitch(kDisableWin32kRendererLockDown))
969 return false; 969 return false;
970 // Default. 970 // Default.
971 return group_name == "Enabled"; 971 return group_name == "Enabled";
972 } 972 }
973 #endif 973 #endif
974 974
975 // Don't dump stuff here, follow the same order as the header. 975 // Don't dump stuff here, follow the same order as the header.
976 976
977 } // namespace switches 977 } // namespace switches
OLDNEW
« no previous file with comments | « content/public/common/content_switches.h ('k') | mojo/services/html_viewer/html_viewer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698