| OLD | NEW |
| 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 "android_webview/browser/aw_browser_context.h" | 5 #include "android_webview/browser/aw_browser_context.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "android_webview/browser/aw_browser_policy_connector.h" | 9 #include "android_webview/browser/aw_browser_policy_connector.h" |
| 10 #include "android_webview/browser/aw_form_database_service.h" | 10 #include "android_webview/browser/aw_form_database_service.h" |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 71 // trigger only in case of real errors. | 71 // trigger only in case of real errors. |
| 72 LOG(WARNING) << "Failed to delete " << path.AsUTF8Unsafe(); | 72 LOG(WARNING) << "Failed to delete " << path.AsUTF8Unsafe(); |
| 73 } | 73 } |
| 74 } | 74 } |
| 75 | 75 |
| 76 AwBrowserContext* g_browser_context = NULL; | 76 AwBrowserContext* g_browser_context = NULL; |
| 77 | 77 |
| 78 std::unique_ptr<net::ProxyConfigService> CreateProxyConfigService() { | 78 std::unique_ptr<net::ProxyConfigService> CreateProxyConfigService() { |
| 79 std::unique_ptr<net::ProxyConfigService> config_service = | 79 std::unique_ptr<net::ProxyConfigService> config_service = |
| 80 net::ProxyService::CreateSystemProxyConfigService( | 80 net::ProxyService::CreateSystemProxyConfigService( |
| 81 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO), | 81 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)); |
| 82 nullptr /* Ignored on Android */); | |
| 83 | 82 |
| 84 // TODO(csharrison) Architect the wrapper better so we don't need a cast for | 83 // TODO(csharrison) Architect the wrapper better so we don't need a cast for |
| 85 // android ProxyConfigServices. | 84 // android ProxyConfigServices. |
| 86 net::ProxyConfigServiceAndroid* android_config_service = | 85 net::ProxyConfigServiceAndroid* android_config_service = |
| 87 static_cast<net::ProxyConfigServiceAndroid*>(config_service.get()); | 86 static_cast<net::ProxyConfigServiceAndroid*>(config_service.get()); |
| 88 android_config_service->set_exclude_pac_url(true); | 87 android_config_service->set_exclude_pac_url(true); |
| 89 return config_service; | 88 return config_service; |
| 90 } | 89 } |
| 91 | 90 |
| 92 bool OverrideBlacklistForURL(const GURL& url, bool* block, int* reason) { | 91 bool OverrideBlacklistForURL(const GURL& url, bool* block, int* reason) { |
| (...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 408 | 407 |
| 409 void AwBrowserContext::RebuildTable( | 408 void AwBrowserContext::RebuildTable( |
| 410 const scoped_refptr<URLEnumerator>& enumerator) { | 409 const scoped_refptr<URLEnumerator>& enumerator) { |
| 411 // Android WebView rebuilds from WebChromeClient.getVisitedHistory. The client | 410 // Android WebView rebuilds from WebChromeClient.getVisitedHistory. The client |
| 412 // can change in the lifetime of this WebView and may not yet be set here. | 411 // can change in the lifetime of this WebView and may not yet be set here. |
| 413 // Therefore this initialization path is not used. | 412 // Therefore this initialization path is not used. |
| 414 enumerator->OnComplete(true); | 413 enumerator->OnComplete(true); |
| 415 } | 414 } |
| 416 | 415 |
| 417 } // namespace android_webview | 416 } // namespace android_webview |
| OLD | NEW |