| 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 1059 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1070 SINGLE_VALUE_TYPE(ash::switches::kAshDebugShortcuts), | 1070 SINGLE_VALUE_TYPE(ash::switches::kAshDebugShortcuts), |
| 1071 }, | 1071 }, |
| 1072 { | 1072 { |
| 1073 "ash-disable-maximize-mode-window-backdrop", | 1073 "ash-disable-maximize-mode-window-backdrop", |
| 1074 IDS_FLAGS_ASH_MAXIMIZE_MODE_WINDOW_BACKDROP_NAME, | 1074 IDS_FLAGS_ASH_MAXIMIZE_MODE_WINDOW_BACKDROP_NAME, |
| 1075 IDS_FLAGS_ASH_MAXIMIZE_MODE_WINDOW_BACKDROP_DESCRIPTION, kOsCrOS, | 1075 IDS_FLAGS_ASH_MAXIMIZE_MODE_WINDOW_BACKDROP_DESCRIPTION, kOsCrOS, |
| 1076 SINGLE_DISABLE_VALUE_TYPE( | 1076 SINGLE_DISABLE_VALUE_TYPE( |
| 1077 ash::switches::kAshDisableMaximizeModeWindowBackdrop), | 1077 ash::switches::kAshDisableMaximizeModeWindowBackdrop), |
| 1078 }, | 1078 }, |
| 1079 { | 1079 { |
| 1080 "ash-enable-docked-windows", IDS_FLAGS_ASH_ENABLE_DOCKED_WINDOWS_NAME, | |
| 1081 IDS_FLAGS_ASH_ENABLE_DOCKED_WINDOWS_DESCRIPTION, kOsAll, | |
| 1082 SINGLE_VALUE_TYPE(ash::switches::kAshEnableDockedWindows), | |
| 1083 }, | |
| 1084 { | |
| 1085 "ash-enable-mirrored-screen", IDS_FLAGS_ASH_ENABLE_MIRRORED_SCREEN_NAME, | 1080 "ash-enable-mirrored-screen", IDS_FLAGS_ASH_ENABLE_MIRRORED_SCREEN_NAME, |
| 1086 IDS_FLAGS_ASH_ENABLE_MIRRORED_SCREEN_DESCRIPTION, kOsCrOS, | 1081 IDS_FLAGS_ASH_ENABLE_MIRRORED_SCREEN_DESCRIPTION, kOsCrOS, |
| 1087 SINGLE_VALUE_TYPE(ash::switches::kAshEnableMirroredScreen), | 1082 SINGLE_VALUE_TYPE(ash::switches::kAshEnableMirroredScreen), |
| 1088 }, | 1083 }, |
| 1089 {"ash-shelf-color", IDS_FLAGS_ASH_SHELF_COLOR, | 1084 {"ash-shelf-color", IDS_FLAGS_ASH_SHELF_COLOR, |
| 1090 IDS_FLAGS_ASH_SHELF_COLOR_DESCRIPTION, kOsCrOS, | 1085 IDS_FLAGS_ASH_SHELF_COLOR_DESCRIPTION, kOsCrOS, |
| 1091 MULTI_VALUE_TYPE(kAshShelfColorChoices)}, | 1086 MULTI_VALUE_TYPE(kAshShelfColorChoices)}, |
| 1092 #endif // USE_ASH | 1087 #endif // USE_ASH |
| 1093 #if defined(OS_CHROMEOS) | 1088 #if defined(OS_CHROMEOS) |
| 1094 {"material-design-ink-drop-animation-speed", | 1089 {"material-design-ink-drop-animation-speed", |
| (...skipping 1455 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2550 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2545 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
| 2551 | 2546 |
| 2552 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2547 const FeatureEntry* GetFeatureEntries(size_t* count) { |
| 2553 *count = arraysize(kFeatureEntries); | 2548 *count = arraysize(kFeatureEntries); |
| 2554 return kFeatureEntries; | 2549 return kFeatureEntries; |
| 2555 } | 2550 } |
| 2556 | 2551 |
| 2557 } // namespace testing | 2552 } // namespace testing |
| 2558 | 2553 |
| 2559 } // namespace about_flags | 2554 } // namespace about_flags |
| OLD | NEW |