| 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 1023 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1034 SINGLE_VALUE_TYPE(ash::switches::kAshDebugShortcuts), | 1034 SINGLE_VALUE_TYPE(ash::switches::kAshDebugShortcuts), |
| 1035 }, | 1035 }, |
| 1036 { | 1036 { |
| 1037 "ash-disable-maximize-mode-window-backdrop", | 1037 "ash-disable-maximize-mode-window-backdrop", |
| 1038 IDS_FLAGS_ASH_MAXIMIZE_MODE_WINDOW_BACKDROP_NAME, | 1038 IDS_FLAGS_ASH_MAXIMIZE_MODE_WINDOW_BACKDROP_NAME, |
| 1039 IDS_FLAGS_ASH_MAXIMIZE_MODE_WINDOW_BACKDROP_DESCRIPTION, kOsCrOS, | 1039 IDS_FLAGS_ASH_MAXIMIZE_MODE_WINDOW_BACKDROP_DESCRIPTION, kOsCrOS, |
| 1040 SINGLE_DISABLE_VALUE_TYPE( | 1040 SINGLE_DISABLE_VALUE_TYPE( |
| 1041 ash::switches::kAshDisableMaximizeModeWindowBackdrop), | 1041 ash::switches::kAshDisableMaximizeModeWindowBackdrop), |
| 1042 }, | 1042 }, |
| 1043 { | 1043 { |
| 1044 "ash-enable-docked-windows", IDS_FLAGS_ASH_ENABLE_DOCKED_WINDOWS_NAME, | |
| 1045 IDS_FLAGS_ASH_ENABLE_DOCKED_WINDOWS_DESCRIPTION, kOsAll, | |
| 1046 SINGLE_VALUE_TYPE(ash::switches::kAshEnableDockedWindows), | |
| 1047 }, | |
| 1048 { | |
| 1049 "ash-enable-mirrored-screen", IDS_FLAGS_ASH_ENABLE_MIRRORED_SCREEN_NAME, | 1044 "ash-enable-mirrored-screen", IDS_FLAGS_ASH_ENABLE_MIRRORED_SCREEN_NAME, |
| 1050 IDS_FLAGS_ASH_ENABLE_MIRRORED_SCREEN_DESCRIPTION, kOsCrOS, | 1045 IDS_FLAGS_ASH_ENABLE_MIRRORED_SCREEN_DESCRIPTION, kOsCrOS, |
| 1051 SINGLE_VALUE_TYPE(ash::switches::kAshEnableMirroredScreen), | 1046 SINGLE_VALUE_TYPE(ash::switches::kAshEnableMirroredScreen), |
| 1052 }, | 1047 }, |
| 1053 #endif // USE_ASH | 1048 #endif // USE_ASH |
| 1054 #if defined(OS_CHROMEOS) | 1049 #if defined(OS_CHROMEOS) |
| 1055 {"material-design-ink-drop-animation-speed", | 1050 {"material-design-ink-drop-animation-speed", |
| 1056 IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_SPEED_NAME, | 1051 IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_SPEED_NAME, |
| 1057 IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_SPEED_DESCRIPTION, kOsCrOS, | 1052 IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_SPEED_DESCRIPTION, kOsCrOS, |
| 1058 MULTI_VALUE_TYPE(kAshMaterialDesignInkDropAnimationSpeed)}, | 1053 MULTI_VALUE_TYPE(kAshMaterialDesignInkDropAnimationSpeed)}, |
| (...skipping 1437 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2496 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2491 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
| 2497 | 2492 |
| 2498 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2493 const FeatureEntry* GetFeatureEntries(size_t* count) { |
| 2499 *count = arraysize(kFeatureEntries); | 2494 *count = arraysize(kFeatureEntries); |
| 2500 return kFeatureEntries; | 2495 return kFeatureEntries; |
| 2501 } | 2496 } |
| 2502 | 2497 |
| 2503 } // namespace testing | 2498 } // namespace testing |
| 2504 | 2499 |
| 2505 } // namespace about_flags | 2500 } // namespace about_flags |
| OLD | NEW |