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 <algorithm> | 7 #include <algorithm> |
8 #include <iterator> | 8 #include <iterator> |
9 #include <map> | 9 #include <map> |
10 #include <set> | 10 #include <set> |
(...skipping 1097 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1108 ENABLE_DISABLE_VALUE_TYPE(switches::kEnablePinch, switches::kDisablePinch), | 1108 ENABLE_DISABLE_VALUE_TYPE(switches::kEnablePinch, switches::kDisablePinch), |
1109 }, | 1109 }, |
1110 { | 1110 { |
1111 "enable-pinch-virtual-viewport", | 1111 "enable-pinch-virtual-viewport", |
1112 IDS_FLAGS_ENABLE_PINCH_VIRTUAL_VIEWPORT_NAME, | 1112 IDS_FLAGS_ENABLE_PINCH_VIRTUAL_VIEWPORT_NAME, |
1113 IDS_FLAGS_ENABLE_PINCH_VIRTUAL_VIEWPORT_DESCRIPTION, | 1113 IDS_FLAGS_ENABLE_PINCH_VIRTUAL_VIEWPORT_DESCRIPTION, |
1114 kOsLinux | kOsWin | kOsCrOS, | 1114 kOsLinux | kOsWin | kOsCrOS, |
1115 SINGLE_VALUE_TYPE(cc::switches::kEnablePinchVirtualViewport), | 1115 SINGLE_VALUE_TYPE(cc::switches::kEnablePinchVirtualViewport), |
1116 }, | 1116 }, |
1117 #endif // defined(USE_ASH) | 1117 #endif // defined(USE_ASH) |
| 1118 { |
| 1119 "enable-viewport-meta", |
| 1120 IDS_FLAGS_ENABLE_VIEWPORT_META_NAME, |
| 1121 IDS_FLAGS_ENABLE_VIEWPORT_META_DESCRIPTION, |
| 1122 kOsLinux | kOsWin | kOsCrOS | kOsMac, |
| 1123 SINGLE_VALUE_TYPE(switches::kEnableViewportMeta), |
| 1124 }, |
1118 #if defined(OS_CHROMEOS) | 1125 #if defined(OS_CHROMEOS) |
1119 { | 1126 { |
1120 "disable-boot-animation", | 1127 "disable-boot-animation", |
1121 IDS_FLAGS_DISABLE_BOOT_ANIMATION, | 1128 IDS_FLAGS_DISABLE_BOOT_ANIMATION, |
1122 IDS_FLAGS_DISABLE_BOOT_ANIMATION_DESCRIPTION, | 1129 IDS_FLAGS_DISABLE_BOOT_ANIMATION_DESCRIPTION, |
1123 kOsCrOSOwnerOnly, | 1130 kOsCrOSOwnerOnly, |
1124 SINGLE_VALUE_TYPE(chromeos::switches::kDisableBootAnimation), | 1131 SINGLE_VALUE_TYPE(chromeos::switches::kDisableBootAnimation), |
1125 }, | 1132 }, |
1126 { | 1133 { |
1127 "file-manager-show-checkboxes", | 1134 "file-manager-show-checkboxes", |
(...skipping 1327 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2455 } | 2462 } |
2456 | 2463 |
2457 const Experiment* GetExperiments(size_t* count) { | 2464 const Experiment* GetExperiments(size_t* count) { |
2458 *count = num_experiments; | 2465 *count = num_experiments; |
2459 return experiments; | 2466 return experiments; |
2460 } | 2467 } |
2461 | 2468 |
2462 } // namespace testing | 2469 } // namespace testing |
2463 | 2470 |
2464 } // namespace about_flags | 2471 } // namespace about_flags |
OLD | NEW |