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 1429 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1440 switches::kDisableOfflineAutoReloadVisibleOnly)}, | 1440 switches::kDisableOfflineAutoReloadVisibleOnly)}, |
1441 {"show-saved-copy", flag_descriptions::kShowSavedCopyName, | 1441 {"show-saved-copy", flag_descriptions::kShowSavedCopyName, |
1442 flag_descriptions::kShowSavedCopyDescription, kOsAll, | 1442 flag_descriptions::kShowSavedCopyDescription, kOsAll, |
1443 MULTI_VALUE_TYPE(kShowSavedCopyChoices)}, | 1443 MULTI_VALUE_TYPE(kShowSavedCopyChoices)}, |
1444 {"default-tile-width", flag_descriptions::kDefaultTileWidthName, | 1444 {"default-tile-width", flag_descriptions::kDefaultTileWidthName, |
1445 flag_descriptions::kDefaultTileWidthDescription, kOsAll, | 1445 flag_descriptions::kDefaultTileWidthDescription, kOsAll, |
1446 MULTI_VALUE_TYPE(kDefaultTileWidthChoices)}, | 1446 MULTI_VALUE_TYPE(kDefaultTileWidthChoices)}, |
1447 {"default-tile-height", flag_descriptions::kDefaultTileHeightName, | 1447 {"default-tile-height", flag_descriptions::kDefaultTileHeightName, |
1448 flag_descriptions::kDefaultTileHeightDescription, kOsAll, | 1448 flag_descriptions::kDefaultTileHeightDescription, kOsAll, |
1449 MULTI_VALUE_TYPE(kDefaultTileHeightChoices)}, | 1449 MULTI_VALUE_TYPE(kDefaultTileHeightChoices)}, |
| 1450 {"disable-gesture-requirement-for-media-playback", |
| 1451 flag_descriptions::kGestureRequirementForMediaPlaybackName, |
| 1452 flag_descriptions::kGestureRequirementForMediaPlaybackDescription, kOsAll, |
| 1453 SINGLE_DISABLE_VALUE_TYPE( |
| 1454 switches::kDisableGestureRequirementForMediaPlayback)}, |
1450 #if defined(OS_CHROMEOS) | 1455 #if defined(OS_CHROMEOS) |
1451 {"enable-virtual-keyboard", flag_descriptions::kVirtualKeyboardName, | 1456 {"enable-virtual-keyboard", flag_descriptions::kVirtualKeyboardName, |
1452 flag_descriptions::kVirtualKeyboardDescription, kOsCrOS, | 1457 flag_descriptions::kVirtualKeyboardDescription, kOsCrOS, |
1453 SINGLE_VALUE_TYPE(keyboard::switches::kEnableVirtualKeyboard)}, | 1458 SINGLE_VALUE_TYPE(keyboard::switches::kEnableVirtualKeyboard)}, |
1454 {"virtual-keyboard-overscroll", | 1459 {"virtual-keyboard-overscroll", |
1455 flag_descriptions::kVirtualKeyboardOverscrollName, | 1460 flag_descriptions::kVirtualKeyboardOverscrollName, |
1456 flag_descriptions::kVirtualKeyboardOverscrollDescription, kOsCrOS, | 1461 flag_descriptions::kVirtualKeyboardOverscrollDescription, kOsCrOS, |
1457 SINGLE_DISABLE_VALUE_TYPE( | 1462 SINGLE_DISABLE_VALUE_TYPE( |
1458 keyboard::switches::kDisableVirtualKeyboardOverscroll)}, | 1463 keyboard::switches::kDisableVirtualKeyboardOverscroll)}, |
1459 {"input-view", flag_descriptions::kInputViewName, | 1464 {"input-view", flag_descriptions::kInputViewName, |
(...skipping 1526 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2986 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2991 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
2987 | 2992 |
2988 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2993 const FeatureEntry* GetFeatureEntries(size_t* count) { |
2989 *count = arraysize(kFeatureEntries); | 2994 *count = arraysize(kFeatureEntries); |
2990 return kFeatureEntries; | 2995 return kFeatureEntries; |
2991 } | 2996 } |
2992 | 2997 |
2993 } // namespace testing | 2998 } // namespace testing |
2994 | 2999 |
2995 } // namespace about_flags | 3000 } // namespace about_flags |
OLD | NEW |