| 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 1045 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1056 SINGLE_VALUE_TYPE(ash::switches::kAshDebugShortcuts), | 1056 SINGLE_VALUE_TYPE(ash::switches::kAshDebugShortcuts), |
| 1057 }, | 1057 }, |
| 1058 { | 1058 { |
| 1059 "ash-disable-maximize-mode-window-backdrop", | 1059 "ash-disable-maximize-mode-window-backdrop", |
| 1060 IDS_FLAGS_ASH_MAXIMIZE_MODE_WINDOW_BACKDROP_NAME, | 1060 IDS_FLAGS_ASH_MAXIMIZE_MODE_WINDOW_BACKDROP_NAME, |
| 1061 IDS_FLAGS_ASH_MAXIMIZE_MODE_WINDOW_BACKDROP_DESCRIPTION, kOsCrOS, | 1061 IDS_FLAGS_ASH_MAXIMIZE_MODE_WINDOW_BACKDROP_DESCRIPTION, kOsCrOS, |
| 1062 SINGLE_DISABLE_VALUE_TYPE( | 1062 SINGLE_DISABLE_VALUE_TYPE( |
| 1063 ash::switches::kAshDisableMaximizeModeWindowBackdrop), | 1063 ash::switches::kAshDisableMaximizeModeWindowBackdrop), |
| 1064 }, | 1064 }, |
| 1065 { | 1065 { |
| 1066 "ash-enable-docked-windows", IDS_FLAGS_ASH_ENABLE_DOCKED_WINDOWS_NAME, | |
| 1067 IDS_FLAGS_ASH_ENABLE_DOCKED_WINDOWS_DESCRIPTION, kOsAll, | |
| 1068 SINGLE_VALUE_TYPE(ash::switches::kAshEnableDockedWindows), | |
| 1069 }, | |
| 1070 { | |
| 1071 "ash-enable-mirrored-screen", IDS_FLAGS_ASH_ENABLE_MIRRORED_SCREEN_NAME, | 1066 "ash-enable-mirrored-screen", IDS_FLAGS_ASH_ENABLE_MIRRORED_SCREEN_NAME, |
| 1072 IDS_FLAGS_ASH_ENABLE_MIRRORED_SCREEN_DESCRIPTION, kOsCrOS, | 1067 IDS_FLAGS_ASH_ENABLE_MIRRORED_SCREEN_DESCRIPTION, kOsCrOS, |
| 1073 SINGLE_VALUE_TYPE(ash::switches::kAshEnableMirroredScreen), | 1068 SINGLE_VALUE_TYPE(ash::switches::kAshEnableMirroredScreen), |
| 1074 }, | 1069 }, |
| 1075 {"ash-shelf-color", IDS_FLAGS_ASH_SHELF_COLOR, | 1070 {"ash-shelf-color", IDS_FLAGS_ASH_SHELF_COLOR, |
| 1076 IDS_FLAGS_ASH_SHELF_COLOR_DESCRIPTION, kOsCrOS, | 1071 IDS_FLAGS_ASH_SHELF_COLOR_DESCRIPTION, kOsCrOS, |
| 1077 MULTI_VALUE_TYPE(kAshShelfColorChoices)}, | 1072 MULTI_VALUE_TYPE(kAshShelfColorChoices)}, |
| 1078 #endif // USE_ASH | 1073 #endif // USE_ASH |
| 1079 #if defined(OS_CHROMEOS) | 1074 #if defined(OS_CHROMEOS) |
| 1080 {"material-design-ink-drop-animation-speed", | 1075 {"material-design-ink-drop-animation-speed", |
| (...skipping 1445 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2526 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2521 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
| 2527 | 2522 |
| 2528 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2523 const FeatureEntry* GetFeatureEntries(size_t* count) { |
| 2529 *count = arraysize(kFeatureEntries); | 2524 *count = arraysize(kFeatureEntries); |
| 2530 return kFeatureEntries; | 2525 return kFeatureEntries; |
| 2531 } | 2526 } |
| 2532 | 2527 |
| 2533 } // namespace testing | 2528 } // namespace testing |
| 2534 | 2529 |
| 2535 } // namespace about_flags | 2530 } // namespace about_flags |
| OLD | NEW |