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 // Experiment to use grouped permission infobars which could show and handle | 216 // Experiment to use grouped permission infobars which could show and handle |
217 // multiple permission requests. | 217 // multiple permission requests. |
218 const base::Feature kUseGroupedPermissionInfobars{ | 218 const base::Feature kUseGroupedPermissionInfobars{ |
219 "UseGroupedPermissionInfobars", base::FEATURE_DISABLED_BY_DEFAULT}; | 219 "UseGroupedPermissionInfobars", base::FEATURE_DISABLED_BY_DEFAULT}; |
220 | 220 |
221 #if defined(OS_CHROMEOS) | 221 #if defined(OS_CHROMEOS) |
222 // Enables or disables the opt-in IME menu in the language settings page. | 222 // Enables or disables the opt-in IME menu in the language settings page. |
223 const base::Feature kOptInImeMenu{"OptInImeMenu", | 223 const base::Feature kOptInImeMenu{"OptInImeMenu", |
224 base::FEATURE_ENABLED_BY_DEFAULT}; | 224 base::FEATURE_ENABLED_BY_DEFAULT}; |
225 | 225 |
226 // Enables or disables PIN quick unlock settings integration. | 226 // Enables or disables PIN quick unlock settings integration. |
jdufault
2016/12/06 18:13:42
Can you update both of these comments to remove th
sammiequon
2016/12/06 18:55:37
Done.
| |
227 const base::Feature kQuickUnlockPin{"QuickUnlockPin", | 227 const base::Feature kQuickUnlockPin{"QuickUnlockPin", |
228 base::FEATURE_DISABLED_BY_DEFAULT}; | 228 base::FEATURE_DISABLED_BY_DEFAULT}; |
229 | 229 |
230 // Enables or disables fingerprint unlock settings integration. | |
231 const base::Feature kQuickUnlockFingerprint{"QuickUnlockFingerprint", | |
232 base::FEATURE_DISABLED_BY_DEFAULT}; | |
233 | |
230 // Enables or disables emoji, handwriting and voice input on opt-in IME menu. | 234 // Enables or disables emoji, handwriting and voice input on opt-in IME menu. |
231 const base::Feature kEHVInputOnImeMenu{"EmojiHandwritingVoiceInput", | 235 const base::Feature kEHVInputOnImeMenu{"EmojiHandwritingVoiceInput", |
232 base::FEATURE_DISABLED_BY_DEFAULT}; | 236 base::FEATURE_DISABLED_BY_DEFAULT}; |
233 #endif // defined(OS_CHROMEOS) | 237 #endif // defined(OS_CHROMEOS) |
234 | 238 |
235 } // namespace features | 239 } // namespace features |
OLD | NEW |