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

Side by Side Diff: chrome/browser/about_flags.cc

Issue 14582024: Change media source switch to refer to the prefixed API. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 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 | Annotate | Revision Log
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome_frame/test/policy_settings_unittest.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 "chrome/browser/about_flags.h" 5 #include "chrome/browser/about_flags.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <iterator> 8 #include <iterator>
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 670 matching lines...) Expand 10 before | Expand all | Expand 10 after
681 { 681 {
682 "enable-async-dns", 682 "enable-async-dns",
683 IDS_FLAGS_ENABLE_ASYNC_DNS_NAME, 683 IDS_FLAGS_ENABLE_ASYNC_DNS_NAME,
684 IDS_FLAGS_ENABLE_ASYNC_DNS_DESCRIPTION, 684 IDS_FLAGS_ENABLE_ASYNC_DNS_DESCRIPTION,
685 kOsWin | kOsMac | kOsLinux | kOsCrOS, 685 kOsWin | kOsMac | kOsLinux | kOsCrOS,
686 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAsyncDns, 686 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAsyncDns,
687 switches::kDisableAsyncDns) 687 switches::kDisableAsyncDns)
688 }, 688 },
689 { 689 {
690 "disable-media-source", 690 "disable-media-source",
691 IDS_FLAGS_DISABLE_MEDIA_SOURCE_NAME, 691 IDS_FLAGS_DISABLE_WEBKIT_MEDIA_SOURCE_NAME,
692 IDS_FLAGS_DISABLE_MEDIA_SOURCE_DESCRIPTION, 692 IDS_FLAGS_DISABLE_WEBKIT_MEDIA_SOURCE_DESCRIPTION,
693 kOsAll, 693 kOsAll,
694 SINGLE_VALUE_TYPE(switches::kDisableMediaSource) 694 SINGLE_VALUE_TYPE(switches::kDisableWebKitMediaSource)
695 }, 695 },
696 { 696 {
697 "disable-encrypted-media", 697 "disable-encrypted-media",
698 IDS_FLAGS_DISABLE_ENCRYPTED_MEDIA_NAME, 698 IDS_FLAGS_DISABLE_ENCRYPTED_MEDIA_NAME,
699 IDS_FLAGS_DISABLE_ENCRYPTED_MEDIA_DESCRIPTION, 699 IDS_FLAGS_DISABLE_ENCRYPTED_MEDIA_DESCRIPTION,
700 kOsDesktop, 700 kOsDesktop,
701 SINGLE_VALUE_TYPE(switches::kDisableEncryptedMedia) 701 SINGLE_VALUE_TYPE(switches::kDisableEncryptedMedia)
702 }, 702 },
703 { 703 {
704 "enable-opus-playback", 704 "enable-opus-playback",
(...skipping 1250 matching lines...) Expand 10 before | Expand all | Expand 10 after
1955 } 1955 }
1956 1956
1957 const Experiment* GetExperiments(size_t* count) { 1957 const Experiment* GetExperiments(size_t* count) {
1958 *count = num_experiments; 1958 *count = num_experiments;
1959 return experiments; 1959 return experiments;
1960 } 1960 }
1961 1961
1962 } // namespace testing 1962 } // namespace testing
1963 1963
1964 } // namespace about_flags 1964 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome_frame/test/policy_settings_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698