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 722 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
733 SINGLE_VALUE_TYPE(extensions::switches::kExtensionsOnChromeURLs)}, | 733 SINGLE_VALUE_TYPE(extensions::switches::kExtensionsOnChromeURLs)}, |
734 #endif | 734 #endif |
735 {"enable-fast-unload", IDS_FLAGS_FAST_UNLOAD_NAME, | 735 {"enable-fast-unload", IDS_FLAGS_FAST_UNLOAD_NAME, |
736 IDS_FLAGS_FAST_UNLOAD_DESCRIPTION, kOsAll, | 736 IDS_FLAGS_FAST_UNLOAD_DESCRIPTION, kOsAll, |
737 SINGLE_VALUE_TYPE(switches::kEnableFastUnload)}, | 737 SINGLE_VALUE_TYPE(switches::kEnableFastUnload)}, |
738 #if defined(ENABLE_EXTENSIONS) | 738 #if defined(ENABLE_EXTENSIONS) |
739 {"enable-app-window-controls", IDS_FLAGS_APP_WINDOW_CONTROLS_NAME, | 739 {"enable-app-window-controls", IDS_FLAGS_APP_WINDOW_CONTROLS_NAME, |
740 IDS_FLAGS_APP_WINDOW_CONTROLS_DESCRIPTION, kOsDesktop, | 740 IDS_FLAGS_APP_WINDOW_CONTROLS_DESCRIPTION, kOsDesktop, |
741 SINGLE_VALUE_TYPE(extensions::switches::kEnableAppWindowControls)}, | 741 SINGLE_VALUE_TYPE(extensions::switches::kEnableAppWindowControls)}, |
742 #endif | 742 #endif |
| 743 {"enable-history-entry-requires-user-gesture", |
| 744 IDS_FLAGS_HISTORY_REQUIRES_USER_GESTURE_NAME, |
| 745 IDS_FLAGS_HISTORY_REQUIRES_USER_GESTURE_DESCRIPTION, kOsAll, |
| 746 SINGLE_VALUE_TYPE(switches::kHistoryEntryRequiresUserGesture)}, |
743 {"disable-hyperlink-auditing", IDS_FLAGS_HYPERLINK_AUDITING_NAME, | 747 {"disable-hyperlink-auditing", IDS_FLAGS_HYPERLINK_AUDITING_NAME, |
744 IDS_FLAGS_HYPERLINK_AUDITING_DESCRIPTION, kOsAll, | 748 IDS_FLAGS_HYPERLINK_AUDITING_DESCRIPTION, kOsAll, |
745 SINGLE_DISABLE_VALUE_TYPE(switches::kNoPings)}, | 749 SINGLE_DISABLE_VALUE_TYPE(switches::kNoPings)}, |
746 #if defined(OS_ANDROID) | 750 #if defined(OS_ANDROID) |
747 {"contextual-search", IDS_FLAGS_CONTEXTUAL_SEARCH, | 751 {"contextual-search", IDS_FLAGS_CONTEXTUAL_SEARCH, |
748 IDS_FLAGS_CONTEXTUAL_SEARCH_DESCRIPTION, kOsAndroid, | 752 IDS_FLAGS_CONTEXTUAL_SEARCH_DESCRIPTION, kOsAndroid, |
749 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableContextualSearch, | 753 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableContextualSearch, |
750 switches::kDisableContextualSearch)}, | 754 switches::kDisableContextualSearch)}, |
751 {"cs-now-on-tap-bar-integration", | 755 {"cs-now-on-tap-bar-integration", |
752 IDS_FLAGS_CONTEXTUAL_SEARCH_NOW_ON_TAP_BAR_INTEGRATION, | 756 IDS_FLAGS_CONTEXTUAL_SEARCH_NOW_ON_TAP_BAR_INTEGRATION, |
(...skipping 1507 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2260 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2264 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
2261 | 2265 |
2262 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2266 const FeatureEntry* GetFeatureEntries(size_t* count) { |
2263 *count = arraysize(kFeatureEntries); | 2267 *count = arraysize(kFeatureEntries); |
2264 return kFeatureEntries; | 2268 return kFeatureEntries; |
2265 } | 2269 } |
2266 | 2270 |
2267 } // namespace testing | 2271 } // namespace testing |
2268 | 2272 |
2269 } // namespace about_flags | 2273 } // namespace about_flags |
OLD | NEW |