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

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: removed ImeTest#testDoesNotHang_rendererCrashes which does not test anything 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 1797 matching lines...) Expand 10 before | Expand all | Expand 10 after
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) 1813 #if defined(OS_ANDROID)
1814 {"enable-ntp-snippets", IDS_FLAGS_ENABLE_NTP_SNIPPETS_NAME, 1814 {"enable-ntp-snippets", IDS_FLAGS_ENABLE_NTP_SNIPPETS_NAME,
1815 IDS_FLAGS_ENABLE_NTP_SNIPPETS_DESCRIPTION, kOsAndroid, 1815 IDS_FLAGS_ENABLE_NTP_SNIPPETS_DESCRIPTION, kOsAndroid,
1816 FEATURE_VALUE_TYPE(chrome::android::kNTPSnippetsFeature)}, 1816 FEATURE_VALUE_TYPE(chrome::android::kNTPSnippetsFeature)},
1817 #endif // defined(OS_ANDROID) 1817 #endif // defined(OS_ANDROID)
1818 #if defined(OS_ANDROID)
1819 {"ime-thread", IDS_FLAGS_IME_THREAD_NAME,
1820 IDS_FLAGS_IME_THREAD_DESCRIPTION, kOsAndroid,
1821 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableImeThread,
1822 switches::kDisableImeThread)},
1823 #endif // defined(OS_ANDROID)
1818 // NOTE: Adding new command-line switches requires adding corresponding 1824 // NOTE: Adding new command-line switches requires adding corresponding
1819 // entries to enum "LoginCustomFlags" in histograms.xml. See note in 1825 // entries to enum "LoginCustomFlags" in histograms.xml. See note in
1820 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. 1826 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test.
1821 }; 1827 };
1822 1828
1823 class FlagsStateSingleton { 1829 class FlagsStateSingleton {
1824 public: 1830 public:
1825 FlagsStateSingleton() 1831 FlagsStateSingleton()
1826 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} 1832 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {}
1827 ~FlagsStateSingleton() {} 1833 ~FlagsStateSingleton() {}
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
2029 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2035 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2030 2036
2031 const FeatureEntry* GetFeatureEntries(size_t* count) { 2037 const FeatureEntry* GetFeatureEntries(size_t* count) {
2032 *count = arraysize(kFeatureEntries); 2038 *count = arraysize(kFeatureEntries);
2033 return kFeatureEntries; 2039 return kFeatureEntries;
2034 } 2040 }
2035 2041
2036 } // namespace testing 2042 } // namespace testing
2037 2043
2038 } // namespace about_flags 2044 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698