| 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 1631 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1642 #endif // defined(TOOLKIT_VIEWS) || defined(OS_ANDROID) | 1642 #endif // defined(TOOLKIT_VIEWS) || defined(OS_ANDROID) |
| 1643 #if defined(OS_ANDROID) | 1643 #if defined(OS_ANDROID) |
| 1644 {"tab-management-experiment-type", IDS_FLAGS_HERB_PROTOTYPE_CHOICES_NAME, | 1644 {"tab-management-experiment-type", IDS_FLAGS_HERB_PROTOTYPE_CHOICES_NAME, |
| 1645 IDS_FLAGS_HERB_PROTOTYPE_CHOICES_DESCRIPTION, kOsAndroid, | 1645 IDS_FLAGS_HERB_PROTOTYPE_CHOICES_DESCRIPTION, kOsAndroid, |
| 1646 MULTI_VALUE_TYPE(kHerbPrototypeChoices)}, | 1646 MULTI_VALUE_TYPE(kHerbPrototypeChoices)}, |
| 1647 {"enable-tab-switcher-in-document-mode", | 1647 {"enable-tab-switcher-in-document-mode", |
| 1648 IDS_FLAGS_TAB_SWITCHER_IN_DOCUMENT_MODE_NAME, | 1648 IDS_FLAGS_TAB_SWITCHER_IN_DOCUMENT_MODE_NAME, |
| 1649 IDS_FLAGS_TAB_SWITCHER_IN_DOCUMENT_MODE_DESCRIPTION, kOsAndroid, | 1649 IDS_FLAGS_TAB_SWITCHER_IN_DOCUMENT_MODE_DESCRIPTION, kOsAndroid, |
| 1650 SINGLE_VALUE_TYPE(switches::kEnableTabSwitcherInDocumentMode)}, | 1650 SINGLE_VALUE_TYPE(switches::kEnableTabSwitcherInDocumentMode)}, |
| 1651 #endif // OS_ANDROID | 1651 #endif // OS_ANDROID |
| 1652 {"enable-md-feedback", IDS_FLAGS_ENABLE_MATERIAL_DESIGN_FEEDBACK_NAME, |
| 1653 IDS_FLAGS_ENABLE_MATERIAL_DESIGN_FEEDBACK_DESCRIPTION, kOsDesktop, |
| 1654 SINGLE_VALUE_TYPE(switches::kEnableMaterialDesignFeedback)}, |
| 1652 {"enable-md-history", IDS_FLAGS_ENABLE_MATERIAL_DESIGN_HISTORY_NAME, | 1655 {"enable-md-history", IDS_FLAGS_ENABLE_MATERIAL_DESIGN_HISTORY_NAME, |
| 1653 IDS_FLAGS_ENABLE_MATERIAL_DESIGN_HISTORY_DESCRIPTION, kOsDesktop, | 1656 IDS_FLAGS_ENABLE_MATERIAL_DESIGN_HISTORY_DESCRIPTION, kOsDesktop, |
| 1654 FEATURE_VALUE_TYPE(features::kMaterialDesignHistoryFeature)}, | 1657 FEATURE_VALUE_TYPE(features::kMaterialDesignHistoryFeature)}, |
| 1655 {"safe-search-url-reporting", IDS_FLAGS_SAFE_SEARCH_URL_REPORTING_NAME, | 1658 {"safe-search-url-reporting", IDS_FLAGS_SAFE_SEARCH_URL_REPORTING_NAME, |
| 1656 IDS_FLAGS_SAFE_SEARCH_URL_REPORTING_DESCRIPTION, kOsAll, | 1659 IDS_FLAGS_SAFE_SEARCH_URL_REPORTING_DESCRIPTION, kOsAll, |
| 1657 FEATURE_VALUE_TYPE(features::kSafeSearchUrlReporting)}, | 1660 FEATURE_VALUE_TYPE(features::kSafeSearchUrlReporting)}, |
| 1658 #if defined(OS_WIN) | 1661 #if defined(OS_WIN) |
| 1659 {"enable-windows-desktop-search-redirection", | 1662 {"enable-windows-desktop-search-redirection", |
| 1660 IDS_FLAGS_WINDOWS_DESKTOP_SEARCH_REDIRECTION_NAME, | 1663 IDS_FLAGS_WINDOWS_DESKTOP_SEARCH_REDIRECTION_NAME, |
| 1661 IDS_FLAGS_WINDOWS_DESKTOP_SEARCH_REDIRECTION_DESCRIPTION, kOsWin, | 1664 IDS_FLAGS_WINDOWS_DESKTOP_SEARCH_REDIRECTION_DESCRIPTION, kOsWin, |
| (...skipping 349 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2011 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2014 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
| 2012 | 2015 |
| 2013 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2016 const FeatureEntry* GetFeatureEntries(size_t* count) { |
| 2014 *count = arraysize(kFeatureEntries); | 2017 *count = arraysize(kFeatureEntries); |
| 2015 return kFeatureEntries; | 2018 return kFeatureEntries; |
| 2016 } | 2019 } |
| 2017 | 2020 |
| 2018 } // namespace testing | 2021 } // namespace testing |
| 2019 | 2022 |
| 2020 } // namespace about_flags | 2023 } // namespace about_flags |
| OLD | NEW |