| 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 773 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 784 switches::kDisableSmoothScrolling)}, | 784 switches::kDisableSmoothScrolling)}, |
| 785 #if defined(USE_AURA) || defined(OS_LINUX) | 785 #if defined(USE_AURA) || defined(OS_LINUX) |
| 786 {"overlay-scrollbars", IDS_FLAGS_OVERLAY_SCROLLBARS_NAME, | 786 {"overlay-scrollbars", IDS_FLAGS_OVERLAY_SCROLLBARS_NAME, |
| 787 IDS_FLAGS_OVERLAY_SCROLLBARS_DESCRIPTION, | 787 IDS_FLAGS_OVERLAY_SCROLLBARS_DESCRIPTION, |
| 788 // Uses the system preference on Mac (a different implementation). | 788 // Uses the system preference on Mac (a different implementation). |
| 789 // On Android, this is always enabled. | 789 // On Android, this is always enabled. |
| 790 kOsLinux | kOsCrOS | kOsWin, | 790 kOsLinux | kOsCrOS | kOsWin, |
| 791 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableOverlayScrollbar, | 791 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableOverlayScrollbar, |
| 792 switches::kDisableOverlayScrollbar)}, | 792 switches::kDisableOverlayScrollbar)}, |
| 793 #endif | 793 #endif |
| 794 {"enable-panels", IDS_FLAGS_PANELS_NAME, IDS_FLAGS_PANELS_DESCRIPTION, | |
| 795 kOsDesktop, ENABLE_DISABLE_VALUE_TYPE(switches::kEnablePanels, | |
| 796 switches::kDisablePanels)}, | |
| 797 {// See http://crbug.com/120416 for how to remove this flag. | 794 {// See http://crbug.com/120416 for how to remove this flag. |
| 798 "save-page-as-mhtml", // FLAGS:RECORD_UMA | 795 "save-page-as-mhtml", // FLAGS:RECORD_UMA |
| 799 IDS_FLAGS_SAVE_PAGE_AS_MHTML_NAME, | 796 IDS_FLAGS_SAVE_PAGE_AS_MHTML_NAME, |
| 800 IDS_FLAGS_SAVE_PAGE_AS_MHTML_DESCRIPTION, kOsMac | kOsWin | kOsLinux, | 797 IDS_FLAGS_SAVE_PAGE_AS_MHTML_DESCRIPTION, kOsMac | kOsWin | kOsLinux, |
| 801 SINGLE_VALUE_TYPE(switches::kSavePageAsMHTML)}, | 798 SINGLE_VALUE_TYPE(switches::kSavePageAsMHTML)}, |
| 802 {"mhtml-generator-option", IDS_FLAGS_MHTML_GENERATOR_OPTION_NAME, | 799 {"mhtml-generator-option", IDS_FLAGS_MHTML_GENERATOR_OPTION_NAME, |
| 803 IDS_FLAGS_MHTML_GENERATOR_OPTION_DESCRIPTION, kOsMac | kOsWin | kOsLinux, | 800 IDS_FLAGS_MHTML_GENERATOR_OPTION_DESCRIPTION, kOsMac | kOsWin | kOsLinux, |
| 804 MULTI_VALUE_TYPE(kMHTMLGeneratorOptionChoices)}, | 801 MULTI_VALUE_TYPE(kMHTMLGeneratorOptionChoices)}, |
| 805 {"enable-quic", IDS_FLAGS_QUIC_NAME, IDS_FLAGS_QUIC_DESCRIPTION, kOsAll, | 802 {"enable-quic", IDS_FLAGS_QUIC_NAME, IDS_FLAGS_QUIC_DESCRIPTION, kOsAll, |
| 806 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableQuic, switches::kDisableQuic)}, | 803 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableQuic, switches::kDisableQuic)}, |
| (...skipping 1458 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2265 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2262 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
| 2266 | 2263 |
| 2267 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2264 const FeatureEntry* GetFeatureEntries(size_t* count) { |
| 2268 *count = arraysize(kFeatureEntries); | 2265 *count = arraysize(kFeatureEntries); |
| 2269 return kFeatureEntries; | 2266 return kFeatureEntries; |
| 2270 } | 2267 } |
| 2271 | 2268 |
| 2272 } // namespace testing | 2269 } // namespace testing |
| 2273 | 2270 |
| 2274 } // namespace about_flags | 2271 } // namespace about_flags |
| OLD | NEW |