| 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 1620 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1631 SINGLE_VALUE_TYPE(switches::kEnableTabSwitcherThemeColors)}, | 1631 SINGLE_VALUE_TYPE(switches::kEnableTabSwitcherThemeColors)}, |
| 1632 #endif // defined(OS_ANDROID) | 1632 #endif // defined(OS_ANDROID) |
| 1633 #if defined(OS_ANDROID) | 1633 #if defined(OS_ANDROID) |
| 1634 {"offline-bookmarks", IDS_FLAGS_OFFLINE_BOOKMARKS_NAME, | 1634 {"offline-bookmarks", IDS_FLAGS_OFFLINE_BOOKMARKS_NAME, |
| 1635 IDS_FLAGS_OFFLINE_BOOKMARKS_DESCRIPTION, kOsAndroid, | 1635 IDS_FLAGS_OFFLINE_BOOKMARKS_DESCRIPTION, kOsAndroid, |
| 1636 FEATURE_VALUE_TYPE(offline_pages::kOfflineBookmarksFeature)}, | 1636 FEATURE_VALUE_TYPE(offline_pages::kOfflineBookmarksFeature)}, |
| 1637 {"offline-pages-background-loading", | 1637 {"offline-pages-background-loading", |
| 1638 IDS_FLAGS_OFFLINE_PAGES_BACKGROUND_LOADING_NAME, | 1638 IDS_FLAGS_OFFLINE_PAGES_BACKGROUND_LOADING_NAME, |
| 1639 IDS_FLAGS_OFFLINE_PAGES_BACKGROUND_LOADING_DESCRIPTION, kOsAndroid, | 1639 IDS_FLAGS_OFFLINE_PAGES_BACKGROUND_LOADING_DESCRIPTION, kOsAndroid, |
| 1640 FEATURE_VALUE_TYPE(offline_pages::kOfflinePagesBackgroundLoadingFeature)}, | 1640 FEATURE_VALUE_TYPE(offline_pages::kOfflinePagesBackgroundLoadingFeature)}, |
| 1641 {"offline-pages-sharing", IDS_FLAGS_OFFLINE_PAGES_SHARING_NAME, |
| 1642 IDS_FLAGS_OFFLINE_PAGES_SHARING_DESCRIPTION, kOsAndroid, |
| 1643 FEATURE_VALUE_TYPE(offline_pages::kOfflinePagesSharingFeature)}, |
| 1641 #endif // defined(OS_ANDROID) | 1644 #endif // defined(OS_ANDROID) |
| 1642 {"disallow-doc-written-script-loads", | 1645 {"disallow-doc-written-script-loads", |
| 1643 IDS_FLAGS_DISALLOW_DOC_WRITTEN_SCRIPTS_UI_NAME, | 1646 IDS_FLAGS_DISALLOW_DOC_WRITTEN_SCRIPTS_UI_NAME, |
| 1644 IDS_FLAGS_DISALLOW_DOC_WRITTEN_SCRIPTS_UI_DESCRIPTION, kOsAll, | 1647 IDS_FLAGS_DISALLOW_DOC_WRITTEN_SCRIPTS_UI_DESCRIPTION, kOsAll, |
| 1645 // NOTE: if we want to add additional experiment entries for other | 1648 // NOTE: if we want to add additional experiment entries for other |
| 1646 // features controlled by kBlinkSettings, we'll need to add logic to | 1649 // features controlled by kBlinkSettings, we'll need to add logic to |
| 1647 // merge the flag values. | 1650 // merge the flag values. |
| 1648 SINGLE_VALUE_TYPE_AND_VALUE( | 1651 SINGLE_VALUE_TYPE_AND_VALUE( |
| 1649 switches::kBlinkSettings, | 1652 switches::kBlinkSettings, |
| 1650 "disallowFetchForDocWrittenScriptsInMainFrame=true")}, | 1653 "disallowFetchForDocWrittenScriptsInMainFrame=true")}, |
| (...skipping 486 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2137 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2140 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
| 2138 | 2141 |
| 2139 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2142 const FeatureEntry* GetFeatureEntries(size_t* count) { |
| 2140 *count = arraysize(kFeatureEntries); | 2143 *count = arraysize(kFeatureEntries); |
| 2141 return kFeatureEntries; | 2144 return kFeatureEntries; |
| 2142 } | 2145 } |
| 2143 | 2146 |
| 2144 } // namespace testing | 2147 } // namespace testing |
| 2145 | 2148 |
| 2146 } // namespace about_flags | 2149 } // namespace about_flags |
| OLD | NEW |