OLD | NEW |
---|---|
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/common/chrome_features.h" | 5 #include "chrome/common/chrome_features.h" |
6 | 6 |
7 #include "extensions/features/features.h" | 7 #include "extensions/features/features.h" |
8 #include "ppapi/features/features.h" | 8 #include "ppapi/features/features.h" |
9 | 9 |
10 namespace features { | 10 namespace features { |
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
216 | 216 |
217 #if defined(OS_CHROMEOS) | 217 #if defined(OS_CHROMEOS) |
218 // Enables or disables the opt-in IME menu in the language settings page. | 218 // Enables or disables the opt-in IME menu in the language settings page. |
219 const base::Feature kOptInImeMenu{"OptInImeMenu", | 219 const base::Feature kOptInImeMenu{"OptInImeMenu", |
220 base::FEATURE_ENABLED_BY_DEFAULT}; | 220 base::FEATURE_ENABLED_BY_DEFAULT}; |
221 | 221 |
222 // Enables or disables PIN quick unlock settings integration. | 222 // Enables or disables PIN quick unlock settings integration. |
223 const base::Feature kQuickUnlockPin{"QuickUnlockPin", | 223 const base::Feature kQuickUnlockPin{"QuickUnlockPin", |
224 base::FEATURE_DISABLED_BY_DEFAULT}; | 224 base::FEATURE_DISABLED_BY_DEFAULT}; |
225 | 225 |
226 // Enables or disables fingerprint unlock settings integration. | |
227 const base::Feature kQuickUnlockFingerprint{"QuickUnlockFingerprint", | |
228 base::FEATURE_DISABLED_BY_DEFAULT}; | |
jdufault
2016/12/02 23:02:12
You need to also add an entry in about_flags.cc so
sammiequon
2016/12/03 21:40:51
Done.
| |
229 | |
226 // Enables or disables emoji, handwriting and voice input on opt-in IME menu. | 230 // Enables or disables emoji, handwriting and voice input on opt-in IME menu. |
227 const base::Feature kEHVInputOnImeMenu{"EmojiHandwritingVoiceInput", | 231 const base::Feature kEHVInputOnImeMenu{"EmojiHandwritingVoiceInput", |
228 base::FEATURE_DISABLED_BY_DEFAULT}; | 232 base::FEATURE_DISABLED_BY_DEFAULT}; |
229 #endif // defined(OS_CHROMEOS) | 233 #endif // defined(OS_CHROMEOS) |
230 | 234 |
231 } // namespace features | 235 } // namespace features |
OLD | NEW |