Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(570)

Side by Side Diff: chrome/browser/about_flags.cc

Issue 1278593004: Introduce ThreadedInputConnection behind a switch (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: prepare for factory unit test, propagate fallback to renderer Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 1799 matching lines...) Expand 10 before | Expand all | Expand 10 after
1810 {"enable-audio-support-for-desktop-share", 1810 {"enable-audio-support-for-desktop-share",
1811 IDS_FLAG_ENABLE_AUDIO_FOR_DESKTOP_SHARE, 1811 IDS_FLAG_ENABLE_AUDIO_FOR_DESKTOP_SHARE,
1812 IDS_FLAG_ENABLE_AUDIO_FOR_DESKTOP_SHARE_DESCRIPTION, 1812 IDS_FLAG_ENABLE_AUDIO_FOR_DESKTOP_SHARE_DESCRIPTION,
1813 kOsAll, 1813 kOsAll,
1814 SINGLE_VALUE_TYPE(switches::kEnableAudioSupportForDesktopShare)}, 1814 SINGLE_VALUE_TYPE(switches::kEnableAudioSupportForDesktopShare)},
1815 #if defined(ENABLE_EXTENSIONS) 1815 #if defined(ENABLE_EXTENSIONS)
1816 {"enable-tab-for-desktop-share", IDS_FLAG_ENABLE_TAB_FOR_DESKTOP_SHARE, 1816 {"enable-tab-for-desktop-share", IDS_FLAG_ENABLE_TAB_FOR_DESKTOP_SHARE,
1817 IDS_FLAG_ENABLE_TAB_FOR_DESKTOP_SHARE_DESCRIPTION, kOsAll, 1817 IDS_FLAG_ENABLE_TAB_FOR_DESKTOP_SHARE_DESCRIPTION, kOsAll,
1818 SINGLE_VALUE_TYPE(extensions::switches::kEnableTabForDesktopShare)} 1818 SINGLE_VALUE_TYPE(extensions::switches::kEnableTabForDesktopShare)}
1819 #endif 1819 #endif
1820 #if defined(OS_ANDROID)
1821 {"ime-thread", IDS_FLAGS_IME_THREAD_NAME,
1822 IDS_FLAGS_IME_THREAD_DESCRIPTION, kOsAndroid,
1823 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableImeThread,
1824 switches::kDisableImeThread)},
1825 #endif // defined(OS_ANDROID)
1820 // NOTE: Adding new command-line switches requires adding corresponding 1826 // NOTE: Adding new command-line switches requires adding corresponding
1821 // entries to enum "LoginCustomFlags" in histograms.xml. See note in 1827 // entries to enum "LoginCustomFlags" in histograms.xml. See note in
1822 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. 1828 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test.
1823 }; 1829 };
1824 1830
1825 class FlagsStateSingleton { 1831 class FlagsStateSingleton {
1826 public: 1832 public:
1827 FlagsStateSingleton() 1833 FlagsStateSingleton()
1828 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} 1834 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {}
1829 ~FlagsStateSingleton() {} 1835 ~FlagsStateSingleton() {}
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
2031 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2037 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2032 2038
2033 const FeatureEntry* GetFeatureEntries(size_t* count) { 2039 const FeatureEntry* GetFeatureEntries(size_t* count) {
2034 *count = arraysize(kFeatureEntries); 2040 *count = arraysize(kFeatureEntries);
2035 return kFeatureEntries; 2041 return kFeatureEntries;
2036 } 2042 }
2037 2043
2038 } // namespace testing 2044 } // namespace testing
2039 2045
2040 } // namespace about_flags 2046 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698