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

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

Issue 1309363003: Add flag to enable alternative services. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix AboutFlagsHistogramTest.CheckHistograms. Created 5 years, 3 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 714 matching lines...) Expand 10 before | Expand all | Expand 10 after
725 "save-page-as-mhtml", // FLAGS:RECORD_UMA 725 "save-page-as-mhtml", // FLAGS:RECORD_UMA
726 IDS_FLAGS_SAVE_PAGE_AS_MHTML_NAME, 726 IDS_FLAGS_SAVE_PAGE_AS_MHTML_NAME,
727 IDS_FLAGS_SAVE_PAGE_AS_MHTML_DESCRIPTION, 727 IDS_FLAGS_SAVE_PAGE_AS_MHTML_DESCRIPTION,
728 kOsMac | kOsWin | kOsLinux, 728 kOsMac | kOsWin | kOsLinux,
729 SINGLE_VALUE_TYPE(switches::kSavePageAsMHTML)}, 729 SINGLE_VALUE_TYPE(switches::kSavePageAsMHTML)},
730 {"enable-quic", 730 {"enable-quic",
731 IDS_FLAGS_ENABLE_QUIC_NAME, 731 IDS_FLAGS_ENABLE_QUIC_NAME,
732 IDS_FLAGS_ENABLE_QUIC_DESCRIPTION, 732 IDS_FLAGS_ENABLE_QUIC_DESCRIPTION,
733 kOsAll, 733 kOsAll,
734 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableQuic, switches::kDisableQuic)}, 734 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableQuic, switches::kDisableQuic)},
735 {"enable-alternative-services",
736 IDS_FLAGS_ENABLE_ALTSVC_NAME,
737 IDS_FLAGS_ENABLE_ALTSVC_DESCRIPTION,
738 kOsAll,
739 SINGLE_VALUE_TYPE(switches::kEnableAltSvc)},
735 {"disable-media-source", 740 {"disable-media-source",
736 IDS_FLAGS_DISABLE_MEDIA_SOURCE_NAME, 741 IDS_FLAGS_DISABLE_MEDIA_SOURCE_NAME,
737 IDS_FLAGS_DISABLE_MEDIA_SOURCE_DESCRIPTION, 742 IDS_FLAGS_DISABLE_MEDIA_SOURCE_DESCRIPTION,
738 kOsAll, 743 kOsAll,
739 SINGLE_VALUE_TYPE(switches::kDisableMediaSource)}, 744 SINGLE_VALUE_TYPE(switches::kDisableMediaSource)},
740 {"disable-encrypted-media", 745 {"disable-encrypted-media",
741 IDS_FLAGS_DISABLE_ENCRYPTED_MEDIA_NAME, 746 IDS_FLAGS_DISABLE_ENCRYPTED_MEDIA_NAME,
742 IDS_FLAGS_DISABLE_ENCRYPTED_MEDIA_DESCRIPTION, 747 IDS_FLAGS_DISABLE_ENCRYPTED_MEDIA_DESCRIPTION,
743 kOsAll, 748 kOsAll,
744 SINGLE_VALUE_TYPE(switches::kDisableEncryptedMedia)}, 749 SINGLE_VALUE_TYPE(switches::kDisableEncryptedMedia)},
(...skipping 1957 matching lines...) Expand 10 before | Expand all | Expand 10 after
2702 } 2707 }
2703 2708
2704 const Experiment* GetExperiments(size_t* count) { 2709 const Experiment* GetExperiments(size_t* count) {
2705 *count = num_experiments; 2710 *count = num_experiments;
2706 return experiments; 2711 return experiments;
2707 } 2712 }
2708 2713
2709 } // namespace testing 2714 } // namespace testing
2710 2715
2711 } // namespace about_flags 2716 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698