| 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 1021 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1032 SINGLE_VALUE_TYPE(ash::switches::kAshDebugShortcuts), | 1032 SINGLE_VALUE_TYPE(ash::switches::kAshDebugShortcuts), |
| 1033 }, | 1033 }, |
| 1034 { | 1034 { |
| 1035 "ash-disable-maximize-mode-window-backdrop", | 1035 "ash-disable-maximize-mode-window-backdrop", |
| 1036 IDS_FLAGS_ASH_MAXIMIZE_MODE_WINDOW_BACKDROP_NAME, | 1036 IDS_FLAGS_ASH_MAXIMIZE_MODE_WINDOW_BACKDROP_NAME, |
| 1037 IDS_FLAGS_ASH_MAXIMIZE_MODE_WINDOW_BACKDROP_DESCRIPTION, kOsCrOS, | 1037 IDS_FLAGS_ASH_MAXIMIZE_MODE_WINDOW_BACKDROP_DESCRIPTION, kOsCrOS, |
| 1038 SINGLE_DISABLE_VALUE_TYPE( | 1038 SINGLE_DISABLE_VALUE_TYPE( |
| 1039 ash::switches::kAshDisableMaximizeModeWindowBackdrop), | 1039 ash::switches::kAshDisableMaximizeModeWindowBackdrop), |
| 1040 }, | 1040 }, |
| 1041 { | 1041 { |
| 1042 "ash-enable-docked-windows", IDS_FLAGS_ASH_ENABLE_DOCKED_WINDOWS_NAME, | |
| 1043 IDS_FLAGS_ASH_ENABLE_DOCKED_WINDOWS_DESCRIPTION, kOsAll, | |
| 1044 SINGLE_VALUE_TYPE(ash::switches::kAshEnableDockedWindows), | |
| 1045 }, | |
| 1046 { | |
| 1047 "ash-enable-mirrored-screen", IDS_FLAGS_ASH_ENABLE_MIRRORED_SCREEN_NAME, | 1042 "ash-enable-mirrored-screen", IDS_FLAGS_ASH_ENABLE_MIRRORED_SCREEN_NAME, |
| 1048 IDS_FLAGS_ASH_ENABLE_MIRRORED_SCREEN_DESCRIPTION, kOsCrOS, | 1043 IDS_FLAGS_ASH_ENABLE_MIRRORED_SCREEN_DESCRIPTION, kOsCrOS, |
| 1049 SINGLE_VALUE_TYPE(ash::switches::kAshEnableMirroredScreen), | 1044 SINGLE_VALUE_TYPE(ash::switches::kAshEnableMirroredScreen), |
| 1050 }, | 1045 }, |
| 1051 #endif // USE_ASH | 1046 #endif // USE_ASH |
| 1052 #if defined(OS_CHROMEOS) | 1047 #if defined(OS_CHROMEOS) |
| 1053 {"material-design-ink-drop-animation-speed", | 1048 {"material-design-ink-drop-animation-speed", |
| 1054 IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_SPEED_NAME, | 1049 IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_SPEED_NAME, |
| 1055 IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_SPEED_DESCRIPTION, kOsCrOS, | 1050 IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_SPEED_DESCRIPTION, kOsCrOS, |
| 1056 MULTI_VALUE_TYPE(kAshMaterialDesignInkDropAnimationSpeed)}, | 1051 MULTI_VALUE_TYPE(kAshMaterialDesignInkDropAnimationSpeed)}, |
| (...skipping 1425 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2482 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2477 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
| 2483 | 2478 |
| 2484 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2479 const FeatureEntry* GetFeatureEntries(size_t* count) { |
| 2485 *count = arraysize(kFeatureEntries); | 2480 *count = arraysize(kFeatureEntries); |
| 2486 return kFeatureEntries; | 2481 return kFeatureEntries; |
| 2487 } | 2482 } |
| 2488 | 2483 |
| 2489 } // namespace testing | 2484 } // namespace testing |
| 2490 | 2485 |
| 2491 } // namespace about_flags | 2486 } // namespace about_flags |
| OLD | NEW |