| 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 971 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 982 IDS_FLAGS_ENABLE_PINCH_SCALE_NAME, | 982 IDS_FLAGS_ENABLE_PINCH_SCALE_NAME, |
| 983 IDS_FLAGS_ENABLE_PINCH_SCALE_DESCRIPTION, | 983 IDS_FLAGS_ENABLE_PINCH_SCALE_DESCRIPTION, |
| 984 kOsLinux | kOsWin | kOsCrOS, | 984 kOsLinux | kOsWin | kOsCrOS, |
| 985 ENABLE_DISABLE_VALUE_TYPE(switches::kEnablePinch, switches::kDisablePinch), | 985 ENABLE_DISABLE_VALUE_TYPE(switches::kEnablePinch, switches::kDisablePinch), |
| 986 }, | 986 }, |
| 987 #endif // defined(USE_ASH) | 987 #endif // defined(USE_ASH) |
| 988 { | 988 { |
| 989 "enable-pinch-virtual-viewport", | 989 "enable-pinch-virtual-viewport", |
| 990 IDS_FLAGS_ENABLE_PINCH_VIRTUAL_VIEWPORT_NAME, | 990 IDS_FLAGS_ENABLE_PINCH_VIRTUAL_VIEWPORT_NAME, |
| 991 IDS_FLAGS_ENABLE_PINCH_VIRTUAL_VIEWPORT_DESCRIPTION, | 991 IDS_FLAGS_ENABLE_PINCH_VIRTUAL_VIEWPORT_DESCRIPTION, |
| 992 kOsLinux | kOsWin | kOsAndroid, | 992 kOsLinux | kOsWin | kOsCrOS | kOsAndroid, |
| 993 SINGLE_VALUE_TYPE(cc::switches::kEnablePinchVirtualViewport), | 993 ENABLE_DISABLE_VALUE_TYPE( |
| 994 cc::switches::kEnablePinchVirtualViewport, |
| 995 cc::switches::kDisablePinchVirtualViewport), |
| 994 }, | 996 }, |
| 995 { | 997 { |
| 996 "enable-viewport-meta", | 998 "enable-viewport-meta", |
| 997 IDS_FLAGS_ENABLE_VIEWPORT_META_NAME, | 999 IDS_FLAGS_ENABLE_VIEWPORT_META_NAME, |
| 998 IDS_FLAGS_ENABLE_VIEWPORT_META_DESCRIPTION, | 1000 IDS_FLAGS_ENABLE_VIEWPORT_META_DESCRIPTION, |
| 999 kOsLinux | kOsWin | kOsCrOS | kOsMac, | 1001 kOsLinux | kOsWin | kOsCrOS | kOsMac, |
| 1000 SINGLE_VALUE_TYPE(switches::kEnableViewportMeta), | 1002 SINGLE_VALUE_TYPE(switches::kEnableViewportMeta), |
| 1001 }, | 1003 }, |
| 1002 #if defined(OS_CHROMEOS) | 1004 #if defined(OS_CHROMEOS) |
| 1003 { | 1005 { |
| (...skipping 1299 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2303 } | 2305 } |
| 2304 | 2306 |
| 2305 const Experiment* GetExperiments(size_t* count) { | 2307 const Experiment* GetExperiments(size_t* count) { |
| 2306 *count = num_experiments; | 2308 *count = num_experiments; |
| 2307 return experiments; | 2309 return experiments; |
| 2308 } | 2310 } |
| 2309 | 2311 |
| 2310 } // namespace testing | 2312 } // namespace testing |
| 2311 | 2313 |
| 2312 } // namespace about_flags | 2314 } // namespace about_flags |
| OLD | NEW |