| 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 1064 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1075 SINGLE_VALUE_TYPE(ash::switches::kAshDebugShortcuts), | 1075 SINGLE_VALUE_TYPE(ash::switches::kAshDebugShortcuts), |
| 1076 }, | 1076 }, |
| 1077 { | 1077 { |
| 1078 "ash-disable-maximize-mode-window-backdrop", | 1078 "ash-disable-maximize-mode-window-backdrop", |
| 1079 IDS_FLAGS_ASH_MAXIMIZE_MODE_WINDOW_BACKDROP_NAME, | 1079 IDS_FLAGS_ASH_MAXIMIZE_MODE_WINDOW_BACKDROP_NAME, |
| 1080 IDS_FLAGS_ASH_MAXIMIZE_MODE_WINDOW_BACKDROP_DESCRIPTION, kOsCrOS, | 1080 IDS_FLAGS_ASH_MAXIMIZE_MODE_WINDOW_BACKDROP_DESCRIPTION, kOsCrOS, |
| 1081 SINGLE_DISABLE_VALUE_TYPE( | 1081 SINGLE_DISABLE_VALUE_TYPE( |
| 1082 ash::switches::kAshDisableMaximizeModeWindowBackdrop), | 1082 ash::switches::kAshDisableMaximizeModeWindowBackdrop), |
| 1083 }, | 1083 }, |
| 1084 { | 1084 { |
| 1085 "ash-enable-docked-windows", IDS_FLAGS_ASH_ENABLE_DOCKED_WINDOWS_NAME, | |
| 1086 IDS_FLAGS_ASH_ENABLE_DOCKED_WINDOWS_DESCRIPTION, kOsAll, | |
| 1087 SINGLE_VALUE_TYPE(ash::switches::kAshEnableDockedWindows), | |
| 1088 }, | |
| 1089 { | |
| 1090 "ash-enable-mirrored-screen", IDS_FLAGS_ASH_ENABLE_MIRRORED_SCREEN_NAME, | 1085 "ash-enable-mirrored-screen", IDS_FLAGS_ASH_ENABLE_MIRRORED_SCREEN_NAME, |
| 1091 IDS_FLAGS_ASH_ENABLE_MIRRORED_SCREEN_DESCRIPTION, kOsCrOS, | 1086 IDS_FLAGS_ASH_ENABLE_MIRRORED_SCREEN_DESCRIPTION, kOsCrOS, |
| 1092 SINGLE_VALUE_TYPE(ash::switches::kAshEnableMirroredScreen), | 1087 SINGLE_VALUE_TYPE(ash::switches::kAshEnableMirroredScreen), |
| 1093 }, | 1088 }, |
| 1094 {"ash-shelf-color", IDS_FLAGS_ASH_SHELF_COLOR, | 1089 {"ash-shelf-color", IDS_FLAGS_ASH_SHELF_COLOR, |
| 1095 IDS_FLAGS_ASH_SHELF_COLOR_DESCRIPTION, kOsCrOS, | 1090 IDS_FLAGS_ASH_SHELF_COLOR_DESCRIPTION, kOsCrOS, |
| 1096 MULTI_VALUE_TYPE(kAshShelfColorChoices)}, | 1091 MULTI_VALUE_TYPE(kAshShelfColorChoices)}, |
| 1097 #endif // USE_ASH | 1092 #endif // USE_ASH |
| 1098 #if defined(OS_CHROMEOS) | 1093 #if defined(OS_CHROMEOS) |
| 1099 {"material-design-ink-drop-animation-speed", | 1094 {"material-design-ink-drop-animation-speed", |
| (...skipping 1475 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2575 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2570 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
| 2576 | 2571 |
| 2577 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2572 const FeatureEntry* GetFeatureEntries(size_t* count) { |
| 2578 *count = arraysize(kFeatureEntries); | 2573 *count = arraysize(kFeatureEntries); |
| 2579 return kFeatureEntries; | 2574 return kFeatureEntries; |
| 2580 } | 2575 } |
| 2581 | 2576 |
| 2582 } // namespace testing | 2577 } // namespace testing |
| 2583 | 2578 |
| 2584 } // namespace about_flags | 2579 } // namespace about_flags |
| OLD | NEW |