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