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

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

Issue 840933003: Async DNS: Remove toggle from about:flags (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove strings from build/ios/grit_whitelist.txt 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
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | no next file » | 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 <iterator> 7 #include <iterator>
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <utility> 10 #include <utility>
(...skipping 650 matching lines...) Expand 10 before | Expand all | Expand 10 after
661 switches::kDisableQuic) 661 switches::kDisableQuic)
662 }, 662 },
663 { 663 {
664 "enable-spdy4", 664 "enable-spdy4",
665 IDS_FLAGS_ENABLE_SPDY4_NAME, 665 IDS_FLAGS_ENABLE_SPDY4_NAME,
666 IDS_FLAGS_ENABLE_SPDY4_DESCRIPTION, 666 IDS_FLAGS_ENABLE_SPDY4_DESCRIPTION,
667 kOsAll, 667 kOsAll,
668 SINGLE_VALUE_TYPE(switches::kEnableSpdy4) 668 SINGLE_VALUE_TYPE(switches::kEnableSpdy4)
669 }, 669 },
670 { 670 {
671 "enable-async-dns",
672 IDS_FLAGS_ENABLE_ASYNC_DNS_NAME,
673 IDS_FLAGS_ENABLE_ASYNC_DNS_DESCRIPTION,
674 kOsWin | kOsMac | kOsLinux | kOsCrOS,
675 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAsyncDns,
676 switches::kDisableAsyncDns)
677 },
678 {
679 "disable-media-source", 671 "disable-media-source",
680 IDS_FLAGS_DISABLE_MEDIA_SOURCE_NAME, 672 IDS_FLAGS_DISABLE_MEDIA_SOURCE_NAME,
681 IDS_FLAGS_DISABLE_MEDIA_SOURCE_DESCRIPTION, 673 IDS_FLAGS_DISABLE_MEDIA_SOURCE_DESCRIPTION,
682 kOsAll, 674 kOsAll,
683 SINGLE_VALUE_TYPE(switches::kDisableMediaSource) 675 SINGLE_VALUE_TYPE(switches::kDisableMediaSource)
684 }, 676 },
685 { 677 {
686 "enable-encrypted-media", 678 "enable-encrypted-media",
687 IDS_FLAGS_ENABLE_ENCRYPTED_MEDIA_NAME, 679 IDS_FLAGS_ENABLE_ENCRYPTED_MEDIA_NAME,
688 IDS_FLAGS_ENABLE_ENCRYPTED_MEDIA_DESCRIPTION, 680 IDS_FLAGS_ENABLE_ENCRYPTED_MEDIA_DESCRIPTION,
(...skipping 1988 matching lines...) Expand 10 before | Expand all | Expand 10 after
2677 } 2669 }
2678 2670
2679 const Experiment* GetExperiments(size_t* count) { 2671 const Experiment* GetExperiments(size_t* count) {
2680 *count = num_experiments; 2672 *count = num_experiments;
2681 return experiments; 2673 return experiments;
2682 } 2674 }
2683 2675
2684 } // namespace testing 2676 } // namespace testing
2685 2677
2686 } // namespace about_flags 2678 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698