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

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

Issue 15679014: Add --enable-webkit-media-source for Android instead of hardcoding it to be disabled. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add chrome bits 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
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 677 matching lines...) Expand 10 before | Expand all | Expand 10 after
688 SINGLE_VALUE_TYPE(switches::kEnableAutologin) 688 SINGLE_VALUE_TYPE(switches::kEnableAutologin)
689 }, 689 },
690 { 690 {
691 "enable-async-dns", 691 "enable-async-dns",
692 IDS_FLAGS_ENABLE_ASYNC_DNS_NAME, 692 IDS_FLAGS_ENABLE_ASYNC_DNS_NAME,
693 IDS_FLAGS_ENABLE_ASYNC_DNS_DESCRIPTION, 693 IDS_FLAGS_ENABLE_ASYNC_DNS_DESCRIPTION,
694 kOsWin | kOsMac | kOsLinux | kOsCrOS, 694 kOsWin | kOsMac | kOsLinux | kOsCrOS,
695 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAsyncDns, 695 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAsyncDns,
696 switches::kDisableAsyncDns) 696 switches::kDisableAsyncDns)
697 }, 697 },
698 #if defined(ANDROID) && !defined(GOOGLE_TV)
699 {
700 "enable-media-source",
701 IDS_FLAGS_ENABLE_WEBKIT_MEDIA_SOURCE_NAME,
702 IDS_FLAGS_ENABLE_WEBKIT_MEDIA_SOURCE_DESCRIPTION,
703 kOsAll,
704 SINGLE_VALUE_TYPE(switches::kEnableWebKitMediaSource)
705 },
706 #else
698 { 707 {
699 "disable-media-source", 708 "disable-media-source",
700 IDS_FLAGS_DISABLE_WEBKIT_MEDIA_SOURCE_NAME, 709 IDS_FLAGS_DISABLE_WEBKIT_MEDIA_SOURCE_NAME,
701 IDS_FLAGS_DISABLE_WEBKIT_MEDIA_SOURCE_DESCRIPTION, 710 IDS_FLAGS_DISABLE_WEBKIT_MEDIA_SOURCE_DESCRIPTION,
702 kOsAll, 711 kOsAll,
703 SINGLE_VALUE_TYPE(switches::kDisableWebKitMediaSource) 712 SINGLE_VALUE_TYPE(switches::kDisableWebKitMediaSource)
704 }, 713 },
714 #endif
705 { 715 {
706 "disable-encrypted-media", 716 "disable-encrypted-media",
707 IDS_FLAGS_DISABLE_ENCRYPTED_MEDIA_NAME, 717 IDS_FLAGS_DISABLE_ENCRYPTED_MEDIA_NAME,
708 IDS_FLAGS_DISABLE_ENCRYPTED_MEDIA_DESCRIPTION, 718 IDS_FLAGS_DISABLE_ENCRYPTED_MEDIA_DESCRIPTION,
709 kOsDesktop, 719 kOsDesktop,
710 SINGLE_VALUE_TYPE(switches::kDisableEncryptedMedia) 720 SINGLE_VALUE_TYPE(switches::kDisableEncryptedMedia)
711 }, 721 },
712 { 722 {
713 "enable-opus-playback", 723 "enable-opus-playback",
714 IDS_FLAGS_ENABLE_OPUS_PLAYBACK_NAME, 724 IDS_FLAGS_ENABLE_OPUS_PLAYBACK_NAME,
(...skipping 1254 matching lines...) Expand 10 before | Expand all | Expand 10 after
1969 } 1979 }
1970 1980
1971 const Experiment* GetExperiments(size_t* count) { 1981 const Experiment* GetExperiments(size_t* count) {
1972 *count = num_experiments; 1982 *count = num_experiments;
1973 return experiments; 1983 return experiments;
1974 } 1984 }
1975 1985
1976 } // namespace testing 1986 } // namespace testing
1977 1987
1978 } // namespace about_flags 1988 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | content/browser/renderer_host/render_process_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698