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 1261 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1272 kOsAll, | 1272 kOsAll, |
1273 MULTI_VALUE_TYPE(kDefaultTileWidthChoices) | 1273 MULTI_VALUE_TYPE(kDefaultTileWidthChoices) |
1274 }, | 1274 }, |
1275 { | 1275 { |
1276 "default-tile-height", | 1276 "default-tile-height", |
1277 IDS_FLAGS_DEFAULT_TILE_HEIGHT_NAME, | 1277 IDS_FLAGS_DEFAULT_TILE_HEIGHT_NAME, |
1278 IDS_FLAGS_DEFAULT_TILE_HEIGHT_DESCRIPTION, | 1278 IDS_FLAGS_DEFAULT_TILE_HEIGHT_DESCRIPTION, |
1279 kOsAll, | 1279 kOsAll, |
1280 MULTI_VALUE_TYPE(kDefaultTileHeightChoices) | 1280 MULTI_VALUE_TYPE(kDefaultTileHeightChoices) |
1281 }, | 1281 }, |
| 1282 #if defined(OS_ANDROID) |
| 1283 { |
| 1284 "disable-gesture-requirement-for-media-playback", |
| 1285 IDS_FLAGS_DISABLE_GESTURE_REQUIREMENT_FOR_MEDIA_PLAYBACK_NAME, |
| 1286 IDS_FLAGS_DISABLE_GESTURE_REQUIREMENT_FOR_MEDIA_PLAYBACK_DESCRIPTION, |
| 1287 kOsAndroid, |
| 1288 SINGLE_VALUE_TYPE(switches::kDisableGestureRequirementForMediaPlayback) |
| 1289 }, |
| 1290 #endif |
1282 #if defined(OS_CHROMEOS) | 1291 #if defined(OS_CHROMEOS) |
1283 { | 1292 { |
1284 "enable-virtual-keyboard", | 1293 "enable-virtual-keyboard", |
1285 IDS_FLAGS_ENABLE_VIRTUAL_KEYBOARD_NAME, | 1294 IDS_FLAGS_ENABLE_VIRTUAL_KEYBOARD_NAME, |
1286 IDS_FLAGS_ENABLE_VIRTUAL_KEYBOARD_DESCRIPTION, | 1295 IDS_FLAGS_ENABLE_VIRTUAL_KEYBOARD_DESCRIPTION, |
1287 kOsCrOS, | 1296 kOsCrOS, |
1288 SINGLE_VALUE_TYPE(keyboard::switches::kEnableVirtualKeyboard) | 1297 SINGLE_VALUE_TYPE(keyboard::switches::kEnableVirtualKeyboard) |
1289 }, | 1298 }, |
1290 { | 1299 { |
1291 "enable-virtual-keyboard-overscroll", | 1300 "enable-virtual-keyboard-overscroll", |
(...skipping 1137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2429 } | 2438 } |
2430 | 2439 |
2431 const Experiment* GetExperiments(size_t* count) { | 2440 const Experiment* GetExperiments(size_t* count) { |
2432 *count = num_experiments; | 2441 *count = num_experiments; |
2433 return experiments; | 2442 return experiments; |
2434 } | 2443 } |
2435 | 2444 |
2436 } // namespace testing | 2445 } // namespace testing |
2437 | 2446 |
2438 } // namespace about_flags | 2447 } // namespace about_flags |
OLD | NEW |