| 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 1027 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1038 IDS_FLAGS_ASH_MAXIMIZE_MODE_WINDOW_BACKDROP_DESCRIPTION, kOsCrOS, | 1038 IDS_FLAGS_ASH_MAXIMIZE_MODE_WINDOW_BACKDROP_DESCRIPTION, kOsCrOS, |
| 1039 SINGLE_DISABLE_VALUE_TYPE( | 1039 SINGLE_DISABLE_VALUE_TYPE( |
| 1040 ash::switches::kAshDisableMaximizeModeWindowBackdrop), | 1040 ash::switches::kAshDisableMaximizeModeWindowBackdrop), |
| 1041 }, | 1041 }, |
| 1042 { | 1042 { |
| 1043 "ash-enable-docked-windows", IDS_FLAGS_ASH_ENABLE_DOCKED_WINDOWS_NAME, | 1043 "ash-enable-docked-windows", IDS_FLAGS_ASH_ENABLE_DOCKED_WINDOWS_NAME, |
| 1044 IDS_FLAGS_ASH_ENABLE_DOCKED_WINDOWS_DESCRIPTION, kOsAll, | 1044 IDS_FLAGS_ASH_ENABLE_DOCKED_WINDOWS_DESCRIPTION, kOsAll, |
| 1045 SINGLE_VALUE_TYPE(ash::switches::kAshEnableDockedWindows), | 1045 SINGLE_VALUE_TYPE(ash::switches::kAshEnableDockedWindows), |
| 1046 }, | 1046 }, |
| 1047 { | 1047 { |
| 1048 "ash-enable-touch-view-testing", | |
| 1049 IDS_FLAGS_ASH_ENABLE_TOUCH_VIEW_TESTING_NAME, | |
| 1050 IDS_FLAGS_ASH_ENABLE_TOUCH_VIEW_TESTING_DESCRIPTION, kOsCrOS, | |
| 1051 SINGLE_VALUE_TYPE(ash::switches::kAshEnableTouchViewTesting), | |
| 1052 }, | |
| 1053 { | |
| 1054 "ash-enable-mirrored-screen", IDS_FLAGS_ASH_ENABLE_MIRRORED_SCREEN_NAME, | 1048 "ash-enable-mirrored-screen", IDS_FLAGS_ASH_ENABLE_MIRRORED_SCREEN_NAME, |
| 1055 IDS_FLAGS_ASH_ENABLE_MIRRORED_SCREEN_DESCRIPTION, kOsCrOS, | 1049 IDS_FLAGS_ASH_ENABLE_MIRRORED_SCREEN_DESCRIPTION, kOsCrOS, |
| 1056 SINGLE_VALUE_TYPE(ash::switches::kAshEnableMirroredScreen), | 1050 SINGLE_VALUE_TYPE(ash::switches::kAshEnableMirroredScreen), |
| 1057 }, | 1051 }, |
| 1058 {"ash-md", IDS_FLAGS_ASH_MD, IDS_FLAGS_ASH_MD_DESCRIPTION, kOsCrOS, | 1052 {"ash-md", IDS_FLAGS_ASH_MD, IDS_FLAGS_ASH_MD_DESCRIPTION, kOsCrOS, |
| 1059 MULTI_VALUE_TYPE(kAshMaterialDesignChoices)}, | 1053 MULTI_VALUE_TYPE(kAshMaterialDesignChoices)}, |
| 1060 #endif // USE_ASH | 1054 #endif // USE_ASH |
| 1061 #if defined(OS_CHROMEOS) | 1055 #if defined(OS_CHROMEOS) |
| 1062 {"material-design-ink-drop-animation-speed", | 1056 {"material-design-ink-drop-animation-speed", |
| 1063 IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_SPEED_NAME, | 1057 IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_SPEED_NAME, |
| (...skipping 1351 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2415 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2409 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
| 2416 | 2410 |
| 2417 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2411 const FeatureEntry* GetFeatureEntries(size_t* count) { |
| 2418 *count = arraysize(kFeatureEntries); | 2412 *count = arraysize(kFeatureEntries); |
| 2419 return kFeatureEntries; | 2413 return kFeatureEntries; |
| 2420 } | 2414 } |
| 2421 | 2415 |
| 2422 } // namespace testing | 2416 } // namespace testing |
| 2423 | 2417 |
| 2424 } // namespace about_flags | 2418 } // namespace about_flags |
| OLD | NEW |