| 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..10947ada6e3013d8d6d3de77e64f9a8947d78903 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()));
|
| +
|
| + // HTTP Negotiate authentication
|
| + 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() {}
|
|
|