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 848 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
859 { | 859 { |
860 "disable-touch-feedback", IDS_FLAGS_TOUCH_FEEDBACK_NAME, | 860 "disable-touch-feedback", IDS_FLAGS_TOUCH_FEEDBACK_NAME, |
861 IDS_FLAGS_TOUCH_FEEDBACK_DESCRIPTION, kOsCrOS, | 861 IDS_FLAGS_TOUCH_FEEDBACK_DESCRIPTION, kOsCrOS, |
862 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableTouchFeedback), | 862 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableTouchFeedback), |
863 }, | 863 }, |
864 { | 864 { |
865 "ash-enable-mirrored-screen", IDS_FLAGS_ASH_ENABLE_MIRRORED_SCREEN_NAME, | 865 "ash-enable-mirrored-screen", IDS_FLAGS_ASH_ENABLE_MIRRORED_SCREEN_NAME, |
866 IDS_FLAGS_ASH_ENABLE_MIRRORED_SCREEN_DESCRIPTION, kOsCrOS, | 866 IDS_FLAGS_ASH_ENABLE_MIRRORED_SCREEN_DESCRIPTION, kOsCrOS, |
867 SINGLE_VALUE_TYPE(ash::switches::kAshEnableMirroredScreen), | 867 SINGLE_VALUE_TYPE(ash::switches::kAshEnableMirroredScreen), |
868 }, | 868 }, |
| 869 {"ash-enable-md", IDS_FLAGS_ASH_MD, IDS_FLAGS_ASH_MD_DESCRIPTION, kOsCrOS, |
| 870 ENABLE_DISABLE_VALUE_TYPE(ash::switches::kAshEnableMaterialDesign, |
| 871 ash::switches::kAshDisableMaterialDesign)}, |
869 { | 872 { |
870 "ash-stable-overview-order", IDS_FLAGS_ASH_STABLE_OVERVIEW_ORDER_NAME, | 873 "ash-stable-overview-order", IDS_FLAGS_ASH_STABLE_OVERVIEW_ORDER_NAME, |
871 IDS_FLAGS_ASH_STABLE_OVERVIEW_ORDER_DESCRIPTION, kOsCrOS, | 874 IDS_FLAGS_ASH_STABLE_OVERVIEW_ORDER_DESCRIPTION, kOsCrOS, |
872 ENABLE_DISABLE_VALUE_TYPE( | 875 ENABLE_DISABLE_VALUE_TYPE( |
873 ash::switches::kAshEnableStableOverviewOrder, | 876 ash::switches::kAshEnableStableOverviewOrder, |
874 ash::switches::kAshDisableStableOverviewOrder), | 877 ash::switches::kAshDisableStableOverviewOrder), |
875 }, | 878 }, |
876 #endif // defined(USE_ASH) | 879 #endif // defined(USE_ASH) |
877 #if defined(OS_CHROMEOS) | 880 #if defined(OS_CHROMEOS) |
878 {"material-design-ink-drop-animation-speed", | 881 {"material-design-ink-drop-animation-speed", |
(...skipping 1132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2011 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2014 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
2012 | 2015 |
2013 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2016 const FeatureEntry* GetFeatureEntries(size_t* count) { |
2014 *count = arraysize(kFeatureEntries); | 2017 *count = arraysize(kFeatureEntries); |
2015 return kFeatureEntries; | 2018 return kFeatureEntries; |
2016 } | 2019 } |
2017 | 2020 |
2018 } // namespace testing | 2021 } // namespace testing |
2019 | 2022 |
2020 } // namespace about_flags | 2023 } // namespace about_flags |
OLD | NEW |