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

Side by Side Diff: chrome/common/pref_names.cc

Issue 1128043007: Support Kerberos on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix a nit I had missed. Created 5 years, 6 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/common/pref_names.h" 5 #include "chrome/common/pref_names.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "chrome/common/pref_font_webkit_names.h" 8 #include "chrome/common/pref_font_webkit_names.h"
9 9
10 namespace prefs { 10 namespace prefs {
(...skipping 1690 matching lines...) Expand 10 before | Expand all | Expand 10 after
1701 const char kAuthServerWhitelist[] = "auth.server_whitelist"; 1701 const char kAuthServerWhitelist[] = "auth.server_whitelist";
1702 1702
1703 // Whitelist containing servers Chrome is allowed to do Kerberos delegation 1703 // Whitelist containing servers Chrome is allowed to do Kerberos delegation
1704 // with. 1704 // with.
1705 const char kAuthNegotiateDelegateWhitelist[] = 1705 const char kAuthNegotiateDelegateWhitelist[] =
1706 "auth.negotiate_delegate_whitelist"; 1706 "auth.negotiate_delegate_whitelist";
1707 1707
1708 // String that specifies the name of a custom GSSAPI library to load. 1708 // String that specifies the name of a custom GSSAPI library to load.
1709 const char kGSSAPILibraryName[] = "auth.gssapi_library_name"; 1709 const char kGSSAPILibraryName[] = "auth.gssapi_library_name";
1710 1710
1711 // String that specifies the name of Android account type to use for Negotiate
Bernhard Bauer 2015/06/10 17:11:02 Nit: s/name of //
aberent 2015/06/15 15:52:19 Done.
1712 // authentication.
1713 const char kAuthAndroidNegotiateAccountType[] =
1714 "auth.android_negotiate_account_type";
1715
1711 // Boolean that specifies whether to allow basic auth prompting on cross- 1716 // Boolean that specifies whether to allow basic auth prompting on cross-
1712 // domain sub-content requests. 1717 // domain sub-content requests.
1713 const char kAllowCrossOriginAuthPrompt[] = "auth.allow_cross_origin_prompt"; 1718 const char kAllowCrossOriginAuthPrompt[] = "auth.allow_cross_origin_prompt";
1714 1719
1715 // Boolean that specifies whether the built-in asynchronous DNS client is used. 1720 // Boolean that specifies whether the built-in asynchronous DNS client is used.
1716 const char kBuiltInDnsClientEnabled[] = "async_dns.enabled"; 1721 const char kBuiltInDnsClientEnabled[] = "async_dns.enabled";
1717 1722
1718 // A pref holding the value of the policy used to explicitly allow or deny 1723 // A pref holding the value of the policy used to explicitly allow or deny
1719 // access to audio capture devices. When enabled or not set, the user is 1724 // access to audio capture devices. When enabled or not set, the user is
1720 // prompted for device access. When disabled, access to audio capture devices 1725 // prompted for device access. When disabled, access to audio capture devices
(...skipping 554 matching lines...) Expand 10 before | Expand all | Expand 10 after
2275 "supervised_users.whitelists"; 2280 "supervised_users.whitelists";
2276 2281
2277 #if defined(ENABLE_EXTENSIONS) 2282 #if defined(ENABLE_EXTENSIONS)
2278 // Policy that indicates how to handle animated images. 2283 // Policy that indicates how to handle animated images.
2279 const char kAnimationPolicy[] = "settings.a11y.animation_policy"; 2284 const char kAnimationPolicy[] = "settings.a11y.animation_policy";
2280 #endif 2285 #endif
2281 2286
2282 const char kBackgroundTracingLastUpload[] = "background_tracing.last_upload"; 2287 const char kBackgroundTracingLastUpload[] = "background_tracing.last_upload";
2283 2288
2284 } // namespace prefs 2289 } // namespace prefs
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698