| OLD | NEW |
| 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 712 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 723 #if defined(USE_AURA) || defined(OS_LINUX) | 723 #if defined(USE_AURA) || defined(OS_LINUX) |
| 724 {"overlay-scrollbars", IDS_FLAGS_OVERLAY_SCROLLBARS_NAME, | 724 {"overlay-scrollbars", IDS_FLAGS_OVERLAY_SCROLLBARS_NAME, |
| 725 IDS_FLAGS_OVERLAY_SCROLLBARS_DESCRIPTION, | 725 IDS_FLAGS_OVERLAY_SCROLLBARS_DESCRIPTION, |
| 726 // Uses the system preference on Mac (a different implementation). | 726 // Uses the system preference on Mac (a different implementation). |
| 727 // On Android, this is always enabled. | 727 // On Android, this is always enabled. |
| 728 kOsLinux | kOsCrOS | kOsWin, | 728 kOsLinux | kOsCrOS | kOsWin, |
| 729 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableOverlayScrollbar, | 729 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableOverlayScrollbar, |
| 730 switches::kDisableOverlayScrollbar)}, | 730 switches::kDisableOverlayScrollbar)}, |
| 731 #endif | 731 #endif |
| 732 {"enable-panels", IDS_FLAGS_PANELS_NAME, IDS_FLAGS_PANELS_DESCRIPTION, | 732 {"enable-panels", IDS_FLAGS_PANELS_NAME, IDS_FLAGS_PANELS_DESCRIPTION, |
| 733 kOsDesktop, ENABLE_DISABLE_VALUE_TYPE(switches::kEnablePanels, | 733 kOsDesktop, SINGLE_VALUE_TYPE(switches::kEnablePanels)}, |
| 734 switches::kDisablePanels)}, | |
| 735 {// See http://crbug.com/120416 for how to remove this flag. | 734 {// See http://crbug.com/120416 for how to remove this flag. |
| 736 "save-page-as-mhtml", // FLAGS:RECORD_UMA | 735 "save-page-as-mhtml", // FLAGS:RECORD_UMA |
| 737 IDS_FLAGS_SAVE_PAGE_AS_MHTML_NAME, | 736 IDS_FLAGS_SAVE_PAGE_AS_MHTML_NAME, |
| 738 IDS_FLAGS_SAVE_PAGE_AS_MHTML_DESCRIPTION, kOsMac | kOsWin | kOsLinux, | 737 IDS_FLAGS_SAVE_PAGE_AS_MHTML_DESCRIPTION, kOsMac | kOsWin | kOsLinux, |
| 739 SINGLE_VALUE_TYPE(switches::kSavePageAsMHTML)}, | 738 SINGLE_VALUE_TYPE(switches::kSavePageAsMHTML)}, |
| 740 {"mhtml-generator-option", IDS_FLAGS_MHTML_GENERATOR_OPTION_NAME, | 739 {"mhtml-generator-option", IDS_FLAGS_MHTML_GENERATOR_OPTION_NAME, |
| 741 IDS_FLAGS_MHTML_GENERATOR_OPTION_DESCRIPTION, kOsMac | kOsWin | kOsLinux, | 740 IDS_FLAGS_MHTML_GENERATOR_OPTION_DESCRIPTION, kOsMac | kOsWin | kOsLinux, |
| 742 MULTI_VALUE_TYPE(kMHTMLGeneratorOptionChoices)}, | 741 MULTI_VALUE_TYPE(kMHTMLGeneratorOptionChoices)}, |
| 743 {"enable-quic", IDS_FLAGS_QUIC_NAME, IDS_FLAGS_QUIC_DESCRIPTION, kOsAll, | 742 {"enable-quic", IDS_FLAGS_QUIC_NAME, IDS_FLAGS_QUIC_DESCRIPTION, kOsAll, |
| 744 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableQuic, switches::kDisableQuic)}, | 743 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableQuic, switches::kDisableQuic)}, |
| (...skipping 1407 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2152 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2151 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
| 2153 | 2152 |
| 2154 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2153 const FeatureEntry* GetFeatureEntries(size_t* count) { |
| 2155 *count = arraysize(kFeatureEntries); | 2154 *count = arraysize(kFeatureEntries); |
| 2156 return kFeatureEntries; | 2155 return kFeatureEntries; |
| 2157 } | 2156 } |
| 2158 | 2157 |
| 2159 } // namespace testing | 2158 } // namespace testing |
| 2160 | 2159 |
| 2161 } // namespace about_flags | 2160 } // namespace about_flags |
| OLD | NEW |