Chromium Code Reviews| Index: android_webview/browser/aw_browser_policy_connector.cc |
| diff --git a/android_webview/browser/aw_browser_policy_connector.cc b/android_webview/browser/aw_browser_policy_connector.cc |
| index f0e03eaa8df75d5713c3715d64f9a2926751094e..f9cce7927f5e6f35bc00e73f66570ca59b33593f 100644 |
| --- a/android_webview/browser/aw_browser_policy_connector.cc |
| +++ b/android_webview/browser/aw_browser_policy_connector.cc |
| @@ -4,6 +4,7 @@ |
| #include "android_webview/browser/aw_browser_policy_connector.h" |
| +#include "android_webview/common/pref_names.h" |
| #include "base/bind.h" |
| #include "components/policy/core/browser/android/android_combined_policy_provider.h" |
| #include "components/policy/core/browser/configuration_policy_handler_list.h" |
| @@ -34,12 +35,21 @@ scoped_ptr<policy::ConfigurationPolicyHandlerList> BuildHandlerList( |
| base::Bind(&PopulatePolicyHandlerParameters), |
| base::Bind(&GetChromePolicyDetails))); |
| + // URL Filtering |
| handlers->AddHandler(make_scoped_ptr(new policy::SimplePolicyHandler( |
| policy::key::kURLWhitelist, policy::policy_prefs::kUrlWhitelist, |
| base::Value::TYPE_LIST))); |
| - |
| handlers->AddHandler( |
| make_scoped_ptr(new policy::URLBlacklistPolicyHandler())); |
| + |
| + // Negotiate authenticaton |
|
Bernhard Bauer
2015/11/10 17:51:28
Nit: "authentication". Also, maybe "HTTP Negotiate
dgn
2015/11/11 12:26:35
Done.
|
| + handlers->AddHandler(make_scoped_ptr(new policy::SimplePolicyHandler( |
| + policy::key::kAuthServerWhitelist, prefs::kAuthServerWhitelist, |
| + base::Value::TYPE_STRING))); |
| + handlers->AddHandler(make_scoped_ptr(new policy::SimplePolicyHandler( |
| + policy::key::kAuthAndroidNegotiateAccountType, |
| + prefs::kAuthAndroidNegotiateAccountType, base::Value::TYPE_STRING))); |
| + |
| return handlers.Pass(); |
| } |
| @@ -47,9 +57,9 @@ scoped_ptr<policy::ConfigurationPolicyHandlerList> BuildHandlerList( |
| AwBrowserPolicyConnector::AwBrowserPolicyConnector() |
| : BrowserPolicyConnectorBase(base::Bind(&BuildHandlerList)) { |
| - SetPlatformPolicyProvider(make_scoped_ptr( |
| - new policy::android::AndroidCombinedPolicyProvider(GetSchemaRegistry()))); |
| - InitPolicyProviders(); |
| + SetPlatformPolicyProvider(make_scoped_ptr( |
| + new policy::android::AndroidCombinedPolicyProvider(GetSchemaRegistry()))); |
| + InitPolicyProviders(); |
| } |
| AwBrowserPolicyConnector::~AwBrowserPolicyConnector() {} |