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 717 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
728 {"extension-apis", IDS_FLAGS_EXPERIMENTAL_EXTENSION_APIS_NAME, | 728 {"extension-apis", IDS_FLAGS_EXPERIMENTAL_EXTENSION_APIS_NAME, |
729 IDS_FLAGS_EXPERIMENTAL_EXTENSION_APIS_DESCRIPTION, kOsDesktop, | 729 IDS_FLAGS_EXPERIMENTAL_EXTENSION_APIS_DESCRIPTION, kOsDesktop, |
730 SINGLE_VALUE_TYPE(extensions::switches::kEnableExperimentalExtensionApis)}, | 730 SINGLE_VALUE_TYPE(extensions::switches::kEnableExperimentalExtensionApis)}, |
731 {"extensions-on-chrome-urls", IDS_FLAGS_EXTENSIONS_ON_CHROME_URLS_NAME, | 731 {"extensions-on-chrome-urls", IDS_FLAGS_EXTENSIONS_ON_CHROME_URLS_NAME, |
732 IDS_FLAGS_EXTENSIONS_ON_CHROME_URLS_DESCRIPTION, kOsAll, | 732 IDS_FLAGS_EXTENSIONS_ON_CHROME_URLS_DESCRIPTION, kOsAll, |
733 SINGLE_VALUE_TYPE(extensions::switches::kExtensionsOnChromeURLs)}, | 733 SINGLE_VALUE_TYPE(extensions::switches::kExtensionsOnChromeURLs)}, |
734 #endif // ENABLE_EXTENSIONS | 734 #endif // ENABLE_EXTENSIONS |
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 BUILDFLAG(ENABLE_EXTENSIONS) | 738 #if BUILDFLAG(ENABLE_EXTENSIONS) |
tapted
2016/12/06 23:28:36
Remove the #if/#endif?
benwells
2016/12/16 02:22:36
Done.
| |
739 {"enable-app-window-controls", IDS_FLAGS_APP_WINDOW_CONTROLS_NAME, | |
740 IDS_FLAGS_APP_WINDOW_CONTROLS_DESCRIPTION, kOsDesktop, | |
741 SINGLE_VALUE_TYPE(extensions::switches::kEnableAppWindowControls)}, | |
742 #endif // ENABLE_EXTENSIONS | 739 #endif // ENABLE_EXTENSIONS |
743 {"enable-history-entry-requires-user-gesture", | 740 {"enable-history-entry-requires-user-gesture", |
744 IDS_FLAGS_HISTORY_REQUIRES_USER_GESTURE_NAME, | 741 IDS_FLAGS_HISTORY_REQUIRES_USER_GESTURE_NAME, |
745 IDS_FLAGS_HISTORY_REQUIRES_USER_GESTURE_DESCRIPTION, kOsAll, | 742 IDS_FLAGS_HISTORY_REQUIRES_USER_GESTURE_DESCRIPTION, kOsAll, |
746 SINGLE_VALUE_TYPE(switches::kHistoryEntryRequiresUserGesture)}, | 743 SINGLE_VALUE_TYPE(switches::kHistoryEntryRequiresUserGesture)}, |
747 {"disable-hyperlink-auditing", IDS_FLAGS_HYPERLINK_AUDITING_NAME, | 744 {"disable-hyperlink-auditing", IDS_FLAGS_HYPERLINK_AUDITING_NAME, |
748 IDS_FLAGS_HYPERLINK_AUDITING_DESCRIPTION, kOsAll, | 745 IDS_FLAGS_HYPERLINK_AUDITING_DESCRIPTION, kOsAll, |
749 SINGLE_DISABLE_VALUE_TYPE(switches::kNoPings)}, | 746 SINGLE_DISABLE_VALUE_TYPE(switches::kNoPings)}, |
750 #if defined(OS_ANDROID) | 747 #if defined(OS_ANDROID) |
751 {"contextual-search", IDS_FLAGS_CONTEXTUAL_SEARCH, | 748 {"contextual-search", IDS_FLAGS_CONTEXTUAL_SEARCH, |
(...skipping 1559 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2311 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2308 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
2312 | 2309 |
2313 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2310 const FeatureEntry* GetFeatureEntries(size_t* count) { |
2314 *count = arraysize(kFeatureEntries); | 2311 *count = arraysize(kFeatureEntries); |
2315 return kFeatureEntries; | 2312 return kFeatureEntries; |
2316 } | 2313 } |
2317 | 2314 |
2318 } // namespace testing | 2315 } // namespace testing |
2319 | 2316 |
2320 } // namespace about_flags | 2317 } // namespace about_flags |
OLD | NEW |