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

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: 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
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 690 matching lines...) Expand 10 before | Expand all | Expand 10 after
701 SINGLE_VALUE_TYPE(switches::kEnableSpdy4) 701 SINGLE_VALUE_TYPE(switches::kEnableSpdy4)
702 }, 702 },
703 { 703 {
704 "disable-media-source", 704 "disable-media-source",
705 IDS_FLAGS_DISABLE_MEDIA_SOURCE_NAME, 705 IDS_FLAGS_DISABLE_MEDIA_SOURCE_NAME,
706 IDS_FLAGS_DISABLE_MEDIA_SOURCE_DESCRIPTION, 706 IDS_FLAGS_DISABLE_MEDIA_SOURCE_DESCRIPTION,
707 kOsAll, 707 kOsAll,
708 SINGLE_VALUE_TYPE(switches::kDisableMediaSource) 708 SINGLE_VALUE_TYPE(switches::kDisableMediaSource)
709 }, 709 },
710 { 710 {
711 "enable-encrypted-media", 711 "disable-encrypted-media",
712 IDS_FLAGS_ENABLE_ENCRYPTED_MEDIA_NAME, 712 IDS_FLAGS_DISABLE_ENCRYPTED_MEDIA_NAME,
713 IDS_FLAGS_ENABLE_ENCRYPTED_MEDIA_DESCRIPTION, 713 IDS_FLAGS_DISABLE_ENCRYPTED_MEDIA_DESCRIPTION,
714 kOsAll, 714 kOsAll,
715 SINGLE_VALUE_TYPE(switches::kEnableEncryptedMedia) 715 SINGLE_VALUE_TYPE(switches::kDisableEncryptedMedia)
716 }, 716 },
717 { 717 {
718 "disable-prefixed-encrypted-media", 718 "disable-prefixed-encrypted-media",
719 IDS_FLAGS_DISABLE_PREFIXED_ENCRYPTED_MEDIA_NAME, 719 IDS_FLAGS_DISABLE_PREFIXED_ENCRYPTED_MEDIA_NAME,
720 IDS_FLAGS_DISABLE_PREFIXED_ENCRYPTED_MEDIA_DESCRIPTION, 720 IDS_FLAGS_DISABLE_PREFIXED_ENCRYPTED_MEDIA_DESCRIPTION,
721 kOsAll, 721 kOsAll,
722 SINGLE_VALUE_TYPE(switches::kDisablePrefixedEncryptedMedia) 722 SINGLE_VALUE_TYPE(switches::kDisablePrefixedEncryptedMedia)
723 }, 723 },
724 #if defined(OS_ANDROID) 724 #if defined(OS_ANDROID)
725 { 725 {
(...skipping 2003 matching lines...) Expand 10 before | Expand all | Expand 10 after
2729 } 2729 }
2730 2730
2731 const Experiment* GetExperiments(size_t* count) { 2731 const Experiment* GetExperiments(size_t* count) {
2732 *count = num_experiments; 2732 *count = num_experiments;
2733 return experiments; 2733 return experiments;
2734 } 2734 }
2735 2735
2736 } // namespace testing 2736 } // namespace testing
2737 2737
2738 } // namespace about_flags 2738 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/chromeos/login/chrome_restart_request.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698