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

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

Issue 995833003: Revert "Revert "Async DNS: Remove toggle from about:flags"" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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 664 matching lines...) Expand 10 before | Expand all | Expand 10 after
675 switches::kDisableQuic) 675 switches::kDisableQuic)
676 }, 676 },
677 { 677 {
678 "enable-spdy4", 678 "enable-spdy4",
679 IDS_FLAGS_ENABLE_SPDY4_NAME, 679 IDS_FLAGS_ENABLE_SPDY4_NAME,
680 IDS_FLAGS_ENABLE_SPDY4_DESCRIPTION, 680 IDS_FLAGS_ENABLE_SPDY4_DESCRIPTION,
681 kOsAll, 681 kOsAll,
682 SINGLE_VALUE_TYPE(switches::kEnableSpdy4) 682 SINGLE_VALUE_TYPE(switches::kEnableSpdy4)
683 }, 683 },
684 { 684 {
685 "enable-async-dns",
686 IDS_FLAGS_ENABLE_ASYNC_DNS_NAME,
687 IDS_FLAGS_ENABLE_ASYNC_DNS_DESCRIPTION,
688 kOsWin | kOsMac | kOsLinux | kOsCrOS,
689 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAsyncDns,
690 switches::kDisableAsyncDns)
691 },
692 {
693 "disable-media-source", 685 "disable-media-source",
694 IDS_FLAGS_DISABLE_MEDIA_SOURCE_NAME, 686 IDS_FLAGS_DISABLE_MEDIA_SOURCE_NAME,
695 IDS_FLAGS_DISABLE_MEDIA_SOURCE_DESCRIPTION, 687 IDS_FLAGS_DISABLE_MEDIA_SOURCE_DESCRIPTION,
696 kOsAll, 688 kOsAll,
697 SINGLE_VALUE_TYPE(switches::kDisableMediaSource) 689 SINGLE_VALUE_TYPE(switches::kDisableMediaSource)
698 }, 690 },
699 { 691 {
700 "disable-encrypted-media", 692 "disable-encrypted-media",
701 IDS_FLAGS_DISABLE_ENCRYPTED_MEDIA_NAME, 693 IDS_FLAGS_DISABLE_ENCRYPTED_MEDIA_NAME,
702 IDS_FLAGS_DISABLE_ENCRYPTED_MEDIA_DESCRIPTION, 694 IDS_FLAGS_DISABLE_ENCRYPTED_MEDIA_DESCRIPTION,
(...skipping 2114 matching lines...) Expand 10 before | Expand all | Expand 10 after
2817 } 2809 }
2818 2810
2819 const Experiment* GetExperiments(size_t* count) { 2811 const Experiment* GetExperiments(size_t* count) {
2820 *count = num_experiments; 2812 *count = num_experiments;
2821 return experiments; 2813 return experiments;
2822 } 2814 }
2823 2815
2824 } // namespace testing 2816 } // namespace testing
2825 2817
2826 } // namespace about_flags 2818 } // 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