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 1792 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1803 {"enable-audio-support-for-desktop-share", | 1803 {"enable-audio-support-for-desktop-share", |
1804 IDS_FLAG_ENABLE_AUDIO_FOR_DESKTOP_SHARE, | 1804 IDS_FLAG_ENABLE_AUDIO_FOR_DESKTOP_SHARE, |
1805 IDS_FLAG_ENABLE_AUDIO_FOR_DESKTOP_SHARE_DESCRIPTION, | 1805 IDS_FLAG_ENABLE_AUDIO_FOR_DESKTOP_SHARE_DESCRIPTION, |
1806 kOsAll, | 1806 kOsAll, |
1807 SINGLE_VALUE_TYPE(switches::kEnableAudioSupportForDesktopShare)}, | 1807 SINGLE_VALUE_TYPE(switches::kEnableAudioSupportForDesktopShare)}, |
1808 #if defined(ENABLE_EXTENSIONS) | 1808 #if defined(ENABLE_EXTENSIONS) |
1809 {"enable-tab-for-desktop-share", IDS_FLAG_ENABLE_TAB_FOR_DESKTOP_SHARE, | 1809 {"enable-tab-for-desktop-share", IDS_FLAG_ENABLE_TAB_FOR_DESKTOP_SHARE, |
1810 IDS_FLAG_ENABLE_TAB_FOR_DESKTOP_SHARE_DESCRIPTION, kOsAll, | 1810 IDS_FLAG_ENABLE_TAB_FOR_DESKTOP_SHARE_DESCRIPTION, kOsAll, |
1811 SINGLE_VALUE_TYPE(extensions::switches::kEnableTabForDesktopShare)} | 1811 SINGLE_VALUE_TYPE(extensions::switches::kEnableTabForDesktopShare)} |
1812 #endif | 1812 #endif |
| 1813 #if defined(OS_ANDROID) |
| 1814 {"ime-thread", IDS_FLAGS_IME_THREAD_NAME, |
| 1815 IDS_FLAGS_IME_THREAD_DESCRIPTION, kOsAndroid, |
| 1816 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableImeThread, |
| 1817 switches::kDisableImeThread)}, |
| 1818 #endif // defined(OS_ANDROID) |
1813 // NOTE: Adding new command-line switches requires adding corresponding | 1819 // NOTE: Adding new command-line switches requires adding corresponding |
1814 // entries to enum "LoginCustomFlags" in histograms.xml. See note in | 1820 // entries to enum "LoginCustomFlags" in histograms.xml. See note in |
1815 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. | 1821 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. |
1816 }; | 1822 }; |
1817 | 1823 |
1818 class FlagsStateSingleton { | 1824 class FlagsStateSingleton { |
1819 public: | 1825 public: |
1820 FlagsStateSingleton() | 1826 FlagsStateSingleton() |
1821 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} | 1827 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} |
1822 ~FlagsStateSingleton() {} | 1828 ~FlagsStateSingleton() {} |
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2024 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2030 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
2025 | 2031 |
2026 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2032 const FeatureEntry* GetFeatureEntries(size_t* count) { |
2027 *count = arraysize(kFeatureEntries); | 2033 *count = arraysize(kFeatureEntries); |
2028 return kFeatureEntries; | 2034 return kFeatureEntries; |
2029 } | 2035 } |
2030 | 2036 |
2031 } // namespace testing | 2037 } // namespace testing |
2032 | 2038 |
2033 } // namespace about_flags | 2039 } // namespace about_flags |
OLD | NEW |