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