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

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

Issue 15383003: Rename switch to disable prefixed Encrypted Media APIs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase only Created 7 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « content/public/common/content_switches.h ('k') | content/renderer/render_thread_impl.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 namespace switches { 7 namespace switches {
8 8
9 // By default, file:// URIs cannot read other file:// URIs. This is an 9 // By default, file:// URIs cannot read other file:// URIs. This is an
10 // override for developers who need the old behavior for testing. 10 // override for developers who need the old behavior for testing.
(...skipping 346 matching lines...) Expand 10 before | Expand all | Expand 10 after
357 const char kEnableLogging[] = "enable-logging"; 357 const char kEnableLogging[] = "enable-logging";
358 358
359 // Enable for Android (see http://crbug.com/233420) or disable for desktop the 359 // Enable for Android (see http://crbug.com/233420) or disable for desktop the
360 // prefixed Media Source API (i.e., the WebKitMediaSource object). 360 // prefixed Media Source API (i.e., the WebKitMediaSource object).
361 #if defined(ANDROID) && !defined(GOOGLE_TV) 361 #if defined(ANDROID) && !defined(GOOGLE_TV)
362 const char kEnableWebKitMediaSource[] = "enable-webkit-media-source"; 362 const char kEnableWebKitMediaSource[] = "enable-webkit-media-source";
363 #else 363 #else
364 const char kDisableWebKitMediaSource[] = "disable-webkit-media-source"; 364 const char kDisableWebKitMediaSource[] = "disable-webkit-media-source";
365 #endif 365 #endif
366 366
367 // Enables support for Encrypted Media Extensions (e.g. MediaKeys).
368 const char kEnableEncryptedMedia[] = "enable-encrypted-media";
369
370 // Disables prefixed Encrypted Media API (e.g. webkitGenerateKeyRequest()).
371 const char kDisableLegacyEncryptedMedia[] = "disable-legacy-encrypted-media";
372
367 // Use fake device for MediaStream to replace actual camera and microphone. 373 // Use fake device for MediaStream to replace actual camera and microphone.
368 const char kUseFakeDeviceForMediaStream[] = "use-fake-device-for-media-stream"; 374 const char kUseFakeDeviceForMediaStream[] = "use-fake-device-for-media-stream";
369 375
370 // On Windows, converts the page to the currently-installed monitor profile. 376 // On Windows, converts the page to the currently-installed monitor profile.
371 // This does NOT enable color management for images. The source is still 377 // This does NOT enable color management for images. The source is still
372 // assumed to be sRGB. 378 // assumed to be sRGB.
373 const char kEnableMonitorProfile[] = "enable-monitor-profile"; 379 const char kEnableMonitorProfile[] = "enable-monitor-profile";
374 380
375 // Enables compositor-accelerated touch-screen pinch gestures. 381 // Enables compositor-accelerated touch-screen pinch gestures.
376 const char kEnablePinch[] = "enable-pinch"; 382 const char kEnablePinch[] = "enable-pinch";
(...skipping 464 matching lines...) Expand 10 before | Expand all | Expand 10 after
841 const char kOverscrollHistoryNavigation[] = 847 const char kOverscrollHistoryNavigation[] =
842 "overscroll-history-navigation"; 848 "overscroll-history-navigation";
843 849
844 // Forward overscroll event data from the renderer to the browser. 850 // Forward overscroll event data from the renderer to the browser.
845 const char kEnableOverscrollNotifications[] = "enable-overscroll-notifications"; 851 const char kEnableOverscrollNotifications[] = "enable-overscroll-notifications";
846 852
847 // Enables 'image/webp' accept header for image requests. 853 // Enables 'image/webp' accept header for image requests.
848 const char kEnableWebPInAcceptHeader[] = "enable-webp-in-accept-header"; 854 const char kEnableWebPInAcceptHeader[] = "enable-webp-in-accept-header";
849 855
850 } // namespace switches 856 } // namespace switches
OLDNEW
« no previous file with comments | « content/public/common/content_switches.h ('k') | content/renderer/render_thread_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698