| 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 1941 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1952 kOsWin | kOsMac | kOsLinux | kOsAndroid, | 1952 kOsWin | kOsMac | kOsLinux | kOsAndroid, |
| 1953 FEATURE_VALUE_TYPE(media::kNewAudioRenderingMixingStrategy)}, | 1953 FEATURE_VALUE_TYPE(media::kNewAudioRenderingMixingStrategy)}, |
| 1954 #if defined(OS_CHROMEOS) | 1954 #if defined(OS_CHROMEOS) |
| 1955 {"enable-intent-picker", IDS_ENABLE_INTENT_PICKER, | 1955 {"enable-intent-picker", IDS_ENABLE_INTENT_PICKER, |
| 1956 IDS_ENABLE_INTENT_PICKER_DESCRIPTION, kOsCrOS, | 1956 IDS_ENABLE_INTENT_PICKER_DESCRIPTION, kOsCrOS, |
| 1957 SINGLE_VALUE_TYPE(switches::kEnableIntentPicker)}, | 1957 SINGLE_VALUE_TYPE(switches::kEnableIntentPicker)}, |
| 1958 {"files-quick-view", IDS_FLAGS_FILES_QUICK_VIEW_NAME, | 1958 {"files-quick-view", IDS_FLAGS_FILES_QUICK_VIEW_NAME, |
| 1959 IDS_FLAGS_FILES_QUICK_VIEW_DESCRIPTION, kOsCrOS, | 1959 IDS_FLAGS_FILES_QUICK_VIEW_DESCRIPTION, kOsCrOS, |
| 1960 ENABLE_DISABLE_VALUE_TYPE(chromeos::switches::kEnableFilesQuickView, | 1960 ENABLE_DISABLE_VALUE_TYPE(chromeos::switches::kEnableFilesQuickView, |
| 1961 chromeos::switches::kDisableFilesQuickView)}, | 1961 chromeos::switches::kDisableFilesQuickView)}, |
| 1962 {"quick-unlock-pin", IDS_FLAGS_QUICK_UNLOCK_PIN, |
| 1963 IDS_FLAGS_QUICK_UNLOCK_PIN_DESCRIPTION, kOsCrOS, |
| 1964 SINGLE_VALUE_TYPE(chromeos::switches::kEnableQuickUnlockPin)}, |
| 1962 #endif // defined(OS_CHROMEOS) | 1965 #endif // defined(OS_CHROMEOS) |
| 1963 // NOTE: Adding new command-line switches requires adding corresponding | 1966 // NOTE: Adding new command-line switches requires adding corresponding |
| 1964 // entries to enum "LoginCustomFlags" in histograms.xml. See note in | 1967 // entries to enum "LoginCustomFlags" in histograms.xml. See note in |
| 1965 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. | 1968 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. |
| 1966 }; | 1969 }; |
| 1967 | 1970 |
| 1968 class FlagsStateSingleton { | 1971 class FlagsStateSingleton { |
| 1969 public: | 1972 public: |
| 1970 FlagsStateSingleton() | 1973 FlagsStateSingleton() |
| 1971 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} | 1974 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} |
| (...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2143 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2146 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
| 2144 | 2147 |
| 2145 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2148 const FeatureEntry* GetFeatureEntries(size_t* count) { |
| 2146 *count = arraysize(kFeatureEntries); | 2149 *count = arraysize(kFeatureEntries); |
| 2147 return kFeatureEntries; | 2150 return kFeatureEntries; |
| 2148 } | 2151 } |
| 2149 | 2152 |
| 2150 } // namespace testing | 2153 } // namespace testing |
| 2151 | 2154 |
| 2152 } // namespace about_flags | 2155 } // namespace about_flags |
| OLD | NEW |