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 1804 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1815 IDS_FLAGS_GOOGLE_BRANDED_CONTEXT_MENU_NAME, | 1815 IDS_FLAGS_GOOGLE_BRANDED_CONTEXT_MENU_NAME, |
1816 IDS_FLAGS_GOOGLE_BRANDED_CONTEXT_MENU_DESCRIPTION, kOsDesktop, | 1816 IDS_FLAGS_GOOGLE_BRANDED_CONTEXT_MENU_DESCRIPTION, kOsDesktop, |
1817 SINGLE_VALUE_TYPE(switches::kEnableGoogleBrandedContextMenu)}, | 1817 SINGLE_VALUE_TYPE(switches::kEnableGoogleBrandedContextMenu)}, |
1818 #endif | 1818 #endif |
1819 #if defined(OS_MACOSX) | 1819 #if defined(OS_MACOSX) |
1820 {"enable-fullscreen-in-tab-detaching", | 1820 {"enable-fullscreen-in-tab-detaching", |
1821 IDS_FLAGS_TAB_DETACHING_IN_FULLSCREEN_NAME, | 1821 IDS_FLAGS_TAB_DETACHING_IN_FULLSCREEN_NAME, |
1822 IDS_FLAGS_TAB_DETACHING_IN_FULLSCREEN_DESCRIPTION, kOsMac, | 1822 IDS_FLAGS_TAB_DETACHING_IN_FULLSCREEN_DESCRIPTION, kOsMac, |
1823 SINGLE_VALUE_TYPE(switches::kEnableFullscreenTabDetaching)}, | 1823 SINGLE_VALUE_TYPE(switches::kEnableFullscreenTabDetaching)}, |
1824 #endif | 1824 #endif |
| 1825 #if defined(OS_ANDROID) |
| 1826 {"media-style-notification", |
| 1827 IDS_FLAGS_MEDIA_STYLE_NOTIFICATION_NAME, |
| 1828 IDS_FLAGS_MEDIA_STYLE_NOTIFICATION_DESCRIPTION, kOsAndroid, |
| 1829 FEATURE_VALUE_TYPE(chrome::android::kMediaStyleNotification)}, |
| 1830 #endif |
1825 // NOTE: Adding new command-line switches requires adding corresponding | 1831 // NOTE: Adding new command-line switches requires adding corresponding |
1826 // entries to enum "LoginCustomFlags" in histograms.xml. See note in | 1832 // entries to enum "LoginCustomFlags" in histograms.xml. See note in |
1827 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. | 1833 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. |
1828 }; | 1834 }; |
1829 | 1835 |
1830 class FlagsStateSingleton { | 1836 class FlagsStateSingleton { |
1831 public: | 1837 public: |
1832 FlagsStateSingleton() | 1838 FlagsStateSingleton() |
1833 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} | 1839 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} |
1834 ~FlagsStateSingleton() {} | 1840 ~FlagsStateSingleton() {} |
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2014 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2020 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
2015 | 2021 |
2016 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2022 const FeatureEntry* GetFeatureEntries(size_t* count) { |
2017 *count = arraysize(kFeatureEntries); | 2023 *count = arraysize(kFeatureEntries); |
2018 return kFeatureEntries; | 2024 return kFeatureEntries; |
2019 } | 2025 } |
2020 | 2026 |
2021 } // namespace testing | 2027 } // namespace testing |
2022 | 2028 |
2023 } // namespace about_flags | 2029 } // namespace about_flags |
OLD | NEW |