| 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 1104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1115 IDS_FLAGS_DEFAULT_TILE_WIDTH_DESCRIPTION, kOsAll, | 1115 IDS_FLAGS_DEFAULT_TILE_WIDTH_DESCRIPTION, kOsAll, |
| 1116 MULTI_VALUE_TYPE(kDefaultTileWidthChoices)}, | 1116 MULTI_VALUE_TYPE(kDefaultTileWidthChoices)}, |
| 1117 {"default-tile-height", IDS_FLAGS_DEFAULT_TILE_HEIGHT_NAME, | 1117 {"default-tile-height", IDS_FLAGS_DEFAULT_TILE_HEIGHT_NAME, |
| 1118 IDS_FLAGS_DEFAULT_TILE_HEIGHT_DESCRIPTION, kOsAll, | 1118 IDS_FLAGS_DEFAULT_TILE_HEIGHT_DESCRIPTION, kOsAll, |
| 1119 MULTI_VALUE_TYPE(kDefaultTileHeightChoices)}, | 1119 MULTI_VALUE_TYPE(kDefaultTileHeightChoices)}, |
| 1120 {"disable-gesture-requirement-for-media-playback", | 1120 {"disable-gesture-requirement-for-media-playback", |
| 1121 IDS_FLAGS_GESTURE_REQUIREMENT_FOR_MEDIA_PLAYBACK_NAME, | 1121 IDS_FLAGS_GESTURE_REQUIREMENT_FOR_MEDIA_PLAYBACK_NAME, |
| 1122 IDS_FLAGS_GESTURE_REQUIREMENT_FOR_MEDIA_PLAYBACK_DESCRIPTION, kOsAll, | 1122 IDS_FLAGS_GESTURE_REQUIREMENT_FOR_MEDIA_PLAYBACK_DESCRIPTION, kOsAll, |
| 1123 SINGLE_DISABLE_VALUE_TYPE( | 1123 SINGLE_DISABLE_VALUE_TYPE( |
| 1124 switches::kDisableGestureRequirementForMediaPlayback)}, | 1124 switches::kDisableGestureRequirementForMediaPlayback)}, |
| 1125 #if !defined(OS_ANDROID) |
| 1126 {"cross-origin-media-playback-requires-user-gesture", |
| 1127 IDS_FLAGS_CROSS_ORIGIN_MEDIA_PLAYBACK_REQUIRES_USER_GESTURE_NAME, |
| 1128 IDS_FLAGS_CROSS_ORIGIN_MEDIA_PLAYBACK_REQUIRES_USER_GESTURE_DESCRIPTION, |
| 1129 kOsDesktop, FEATURE_VALUE_TYPE( |
| 1130 features::kCrossOriginMediaPlaybackRequiresUserGesture)}, |
| 1131 #endif // !defined(OS_ANDROID) |
| 1132 |
| 1125 #if defined(OS_CHROMEOS) | 1133 #if defined(OS_CHROMEOS) |
| 1126 {"enable-virtual-keyboard", IDS_FLAGS_VIRTUAL_KEYBOARD_NAME, | 1134 {"enable-virtual-keyboard", IDS_FLAGS_VIRTUAL_KEYBOARD_NAME, |
| 1127 IDS_FLAGS_VIRTUAL_KEYBOARD_DESCRIPTION, kOsCrOS, | 1135 IDS_FLAGS_VIRTUAL_KEYBOARD_DESCRIPTION, kOsCrOS, |
| 1128 SINGLE_VALUE_TYPE(keyboard::switches::kEnableVirtualKeyboard)}, | 1136 SINGLE_VALUE_TYPE(keyboard::switches::kEnableVirtualKeyboard)}, |
| 1129 {"virtual-keyboard-overscroll", IDS_FLAGS_VIRTUAL_KEYBOARD_OVERSCROLL_NAME, | 1137 {"virtual-keyboard-overscroll", IDS_FLAGS_VIRTUAL_KEYBOARD_OVERSCROLL_NAME, |
| 1130 IDS_FLAGS_VIRTUAL_KEYBOARD_OVERSCROLL_DESCRIPTION, kOsCrOS, | 1138 IDS_FLAGS_VIRTUAL_KEYBOARD_OVERSCROLL_DESCRIPTION, kOsCrOS, |
| 1131 SINGLE_DISABLE_VALUE_TYPE( | 1139 SINGLE_DISABLE_VALUE_TYPE( |
| 1132 keyboard::switches::kDisableVirtualKeyboardOverscroll)}, | 1140 keyboard::switches::kDisableVirtualKeyboardOverscroll)}, |
| 1133 {"input-view", IDS_FLAGS_INPUT_VIEW_NAME, IDS_FLAGS_INPUT_VIEW_DESCRIPTION, | 1141 {"input-view", IDS_FLAGS_INPUT_VIEW_NAME, IDS_FLAGS_INPUT_VIEW_DESCRIPTION, |
| 1134 kOsCrOS, SINGLE_DISABLE_VALUE_TYPE(keyboard::switches::kDisableInputView)}, | 1142 kOsCrOS, SINGLE_DISABLE_VALUE_TYPE(keyboard::switches::kDisableInputView)}, |
| (...skipping 1181 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2316 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2324 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
| 2317 | 2325 |
| 2318 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2326 const FeatureEntry* GetFeatureEntries(size_t* count) { |
| 2319 *count = arraysize(kFeatureEntries); | 2327 *count = arraysize(kFeatureEntries); |
| 2320 return kFeatureEntries; | 2328 return kFeatureEntries; |
| 2321 } | 2329 } |
| 2322 | 2330 |
| 2323 } // namespace testing | 2331 } // namespace testing |
| 2324 | 2332 |
| 2325 } // namespace about_flags | 2333 } // namespace about_flags |
| OLD | NEW |