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

Unified Diff: android_webview/browser/aw_browser_context.cc

Issue 1431473004: Add Kerberos support to webview (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ActivitylessNegoAuth
Patch Set: Document the new supported policies Created 5 years, 1 month 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 side-by-side diff with in-line comments
Download patch
Index: android_webview/browser/aw_browser_context.cc
diff --git a/android_webview/browser/aw_browser_context.cc b/android_webview/browser/aw_browser_context.cc
index 15910789e0b8d0d5383eb6155c0b082f8f0df2e0..4f3fdb1065c6bc911939d141b01466ab98e082e4 100644
--- a/android_webview/browser/aw_browser_context.cc
+++ b/android_webview/browser/aw_browser_context.cc
@@ -47,6 +47,18 @@ using content::BrowserThread;
namespace android_webview {
+namespace prefs {
+
+// String that specifies the Android account type to use for Negotiate
+// authentication.
+const char kAuthAndroidNegotiateAccountType[] =
+ "auth.android_negotiate_account_type";
+
+// Whitelist containing servers for which Integrated Authentication is enabled.
+const char kAuthServerWhitelist[] = "auth.server_whitelist";
+
+} // namespace prefs
+
namespace {
// Shows notifications which correspond to PersistentPrefStore's reading errors.
@@ -181,8 +193,14 @@ void AwBrowserContext::PreMainMessageLoopRun() {
LOG(WARNING) << "Failed to get cache directory for Android WebView. "
<< "Using app data directory as a fallback.";
}
+
+ browser_policy_connector_.reset(new AwBrowserPolicyConnector());
+
+ InitUserPrefService();
+
url_request_context_getter_ = new AwURLRequestContextGetter(
- cache_path, cookie_store_.get(), CreateProxyConfigService());
+ cache_path, cookie_store_.get(), CreateProxyConfigService(),
+ user_pref_service_.get());
data_reduction_proxy_io_data_.reset(
new data_reduction_proxy::DataReductionProxyIOData(
@@ -220,10 +238,6 @@ void AwBrowserContext::PreMainMessageLoopRun() {
form_database_service_.reset(
new AwFormDatabaseService(context_storage_path_));
- browser_policy_connector_.reset(new AwBrowserPolicyConnector());
-
- InitUserPrefService();
-
// Ensure the storage partition is initialized in time for DataReductionProxy.
EnsureResourceContextInitialized(this);
@@ -298,7 +312,7 @@ AwMessagePortService* AwBrowserContext::GetMessagePortService() {
return message_port_service_.get();
}
-// Create user pref service for autofill functionality.
+// Create user pref service
void AwBrowserContext::InitUserPrefService() {
user_prefs::PrefRegistrySyncable* pref_registry =
new user_prefs::PrefRegistrySyncable();
@@ -314,6 +328,10 @@ void AwBrowserContext::InitUserPrefService() {
data_reduction_proxy::RegisterSimpleProfilePrefs(pref_registry);
policy::URLBlacklistManager::RegisterProfilePrefs(pref_registry);
+ pref_registry->RegisterStringPref(prefs::kAuthServerWhitelist, std::string());
+ pref_registry->RegisterStringPref(prefs::kAuthAndroidNegotiateAccountType,
+ std::string());
+
base::PrefServiceFactory pref_service_factory;
pref_service_factory.set_user_prefs(make_scoped_refptr(new AwPrefStore()));
pref_service_factory.set_managed_prefs(
« no previous file with comments | « android_webview/browser/aw_browser_context.h ('k') | android_webview/browser/aw_browser_policy_connector.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698