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 1179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1190 IDS_FLAGS_DEFAULT_TILE_HEIGHT_NAME, | 1190 IDS_FLAGS_DEFAULT_TILE_HEIGHT_NAME, |
1191 IDS_FLAGS_DEFAULT_TILE_HEIGHT_DESCRIPTION, | 1191 IDS_FLAGS_DEFAULT_TILE_HEIGHT_DESCRIPTION, |
1192 kOsAll, | 1192 kOsAll, |
1193 MULTI_VALUE_TYPE(kDefaultTileHeightChoices)}, | 1193 MULTI_VALUE_TYPE(kDefaultTileHeightChoices)}, |
1194 {"disable-gesture-requirement-for-media-playback", | 1194 {"disable-gesture-requirement-for-media-playback", |
1195 IDS_FLAGS_GESTURE_REQUIREMENT_FOR_MEDIA_PLAYBACK_NAME, | 1195 IDS_FLAGS_GESTURE_REQUIREMENT_FOR_MEDIA_PLAYBACK_NAME, |
1196 IDS_FLAGS_GESTURE_REQUIREMENT_FOR_MEDIA_PLAYBACK_DESCRIPTION, | 1196 IDS_FLAGS_GESTURE_REQUIREMENT_FOR_MEDIA_PLAYBACK_DESCRIPTION, |
1197 kOsAll, | 1197 kOsAll, |
1198 SINGLE_DISABLE_VALUE_TYPE( | 1198 SINGLE_DISABLE_VALUE_TYPE( |
1199 switches::kDisableGestureRequirementForMediaPlayback)}, | 1199 switches::kDisableGestureRequirementForMediaPlayback)}, |
| 1200 {"disable-gesture-requirement-for-presentation", |
| 1201 IDS_FLAGS_GESTURE_REQUIREMENT_FOR_PRESENTATION_NAME, |
| 1202 IDS_FLAGS_GESTURE_REQUIREMENT_FOR_PRESENTATION_DESCRIPTION, |
| 1203 kOsAll, |
| 1204 SINGLE_DISABLE_VALUE_TYPE( |
| 1205 switches::kDisableGestureRequirementForPresentation)}, |
1200 #if defined(OS_CHROMEOS) | 1206 #if defined(OS_CHROMEOS) |
1201 {"enable-virtual-keyboard", | 1207 {"enable-virtual-keyboard", |
1202 IDS_FLAGS_VIRTUAL_KEYBOARD_NAME, | 1208 IDS_FLAGS_VIRTUAL_KEYBOARD_NAME, |
1203 IDS_FLAGS_VIRTUAL_KEYBOARD_DESCRIPTION, | 1209 IDS_FLAGS_VIRTUAL_KEYBOARD_DESCRIPTION, |
1204 kOsCrOS, | 1210 kOsCrOS, |
1205 SINGLE_VALUE_TYPE(keyboard::switches::kEnableVirtualKeyboard)}, | 1211 SINGLE_VALUE_TYPE(keyboard::switches::kEnableVirtualKeyboard)}, |
1206 {"virtual-keyboard-overscroll", | 1212 {"virtual-keyboard-overscroll", |
1207 IDS_FLAGS_VIRTUAL_KEYBOARD_OVERSCROLL_NAME, | 1213 IDS_FLAGS_VIRTUAL_KEYBOARD_OVERSCROLL_NAME, |
1208 IDS_FLAGS_VIRTUAL_KEYBOARD_OVERSCROLL_DESCRIPTION, | 1214 IDS_FLAGS_VIRTUAL_KEYBOARD_OVERSCROLL_DESCRIPTION, |
1209 kOsCrOS, | 1215 kOsCrOS, |
(...skipping 1172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2382 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2388 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
2383 | 2389 |
2384 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2390 const FeatureEntry* GetFeatureEntries(size_t* count) { |
2385 *count = arraysize(kFeatureEntries); | 2391 *count = arraysize(kFeatureEntries); |
2386 return kFeatureEntries; | 2392 return kFeatureEntries; |
2387 } | 2393 } |
2388 | 2394 |
2389 } // namespace testing | 2395 } // namespace testing |
2390 | 2396 |
2391 } // namespace about_flags | 2397 } // namespace about_flags |
OLD | NEW |