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

Side by Side Diff: chrome/browser/about_flags.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: 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
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 "chrome/browser/about_flags.h" 5 #include "chrome/browser/about_flags.h"
6 6
7 #include <iterator> 7 #include <iterator>
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <utility> 10 #include <utility>
(...skipping 680 matching lines...) Expand 10 before | Expand all | Expand 10 after
691 SINGLE_VALUE_TYPE(switches::kEnableSpdy4) 691 SINGLE_VALUE_TYPE(switches::kEnableSpdy4)
692 }, 692 },
693 { 693 {
694 "disable-media-source", 694 "disable-media-source",
695 IDS_FLAGS_DISABLE_MEDIA_SOURCE_NAME, 695 IDS_FLAGS_DISABLE_MEDIA_SOURCE_NAME,
696 IDS_FLAGS_DISABLE_MEDIA_SOURCE_DESCRIPTION, 696 IDS_FLAGS_DISABLE_MEDIA_SOURCE_DESCRIPTION,
697 kOsAll, 697 kOsAll,
698 SINGLE_VALUE_TYPE(switches::kDisableMediaSource) 698 SINGLE_VALUE_TYPE(switches::kDisableMediaSource)
699 }, 699 },
700 { 700 {
701 "enable-encrypted-media", 701 "disable-encrypted-media",
702 IDS_FLAGS_ENABLE_ENCRYPTED_MEDIA_NAME, 702 IDS_FLAGS_DISABLE_ENCRYPTED_MEDIA_NAME,
703 IDS_FLAGS_ENABLE_ENCRYPTED_MEDIA_DESCRIPTION, 703 IDS_FLAGS_DISABLE_ENCRYPTED_MEDIA_DESCRIPTION,
704 kOsAll, 704 kOsAll,
705 SINGLE_VALUE_TYPE(switches::kEnableEncryptedMedia) 705 SINGLE_VALUE_TYPE(switches::kDisableEncryptedMedia)
706 }, 706 },
707 { 707 {
708 "disable-prefixed-encrypted-media", 708 "disable-prefixed-encrypted-media",
709 IDS_FLAGS_DISABLE_PREFIXED_ENCRYPTED_MEDIA_NAME, 709 IDS_FLAGS_DISABLE_PREFIXED_ENCRYPTED_MEDIA_NAME,
710 IDS_FLAGS_DISABLE_PREFIXED_ENCRYPTED_MEDIA_DESCRIPTION, 710 IDS_FLAGS_DISABLE_PREFIXED_ENCRYPTED_MEDIA_DESCRIPTION,
711 kOsAll, 711 kOsAll,
712 SINGLE_VALUE_TYPE(switches::kDisablePrefixedEncryptedMedia) 712 SINGLE_VALUE_TYPE(switches::kDisablePrefixedEncryptedMedia)
713 }, 713 },
714 #if defined(OS_ANDROID) 714 #if defined(OS_ANDROID)
715 { 715 {
(...skipping 2010 matching lines...) Expand 10 before | Expand all | Expand 10 after
2726 } 2726 }
2727 2727
2728 const Experiment* GetExperiments(size_t* count) { 2728 const Experiment* GetExperiments(size_t* count) {
2729 *count = num_experiments; 2729 *count = num_experiments;
2730 return experiments; 2730 return experiments;
2731 } 2731 }
2732 2732
2733 } // namespace testing 2733 } // namespace testing
2734 2734
2735 } // namespace about_flags 2735 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698