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

Unified Diff: android_webview/browser/aw_content_browser_client.cc

Issue 12091111: Implement Webviewclient.onReceivedSslError (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add a bridge for aw_contents_client Created 7 years, 10 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 side-by-side diff with in-line comments
Download patch
Index: android_webview/browser/aw_content_browser_client.cc
diff --git a/android_webview/browser/aw_content_browser_client.cc b/android_webview/browser/aw_content_browser_client.cc
index bc4918be2a9a606935bf2bef4dd0e0605406a3b4..9d5ef40d01609f46146ffff70fb7ea45139fc29d 100644
--- a/android_webview/browser/aw_content_browser_client.cc
+++ b/android_webview/browser/aw_content_browser_client.cc
@@ -5,6 +5,7 @@
#include "android_webview/browser/aw_content_browser_client.h"
#include "android_webview/browser/aw_browser_main_parts.h"
+#include "android_webview/browser/aw_certificate_error_handler_base.h"
#include "android_webview/browser/aw_cookie_access_policy.h"
#include "android_webview/browser/aw_quota_permission_context.h"
#include "android_webview/browser/net_disk_cache_remover.h"
@@ -20,6 +21,7 @@
#include "content/public/common/url_constants.h"
#include "grit/ui_resources.h"
#include "net/android/network_library.h"
+#include "net/base/ssl_info.h"
#include "ui/base/resource/resource_bundle.h"
namespace {
@@ -265,9 +267,15 @@ void AwContentBrowserClient::AllowCertificateError(
bool strict_enforcement,
const base::Callback<void(bool)>& callback,
bool* cancel_request) {
- // TODO(boliu): Implement this to power WebViewClient.onReceivedSslError.
- NOTIMPLEMENTED();
- *cancel_request = true;
+
+ AwCertificateErrorHandlerBase* error_handler =
+ AwCertificateErrorHandlerBase::FromID(render_process_id, render_view_id);
joth 2013/02/22 01:15:45 you're fighting your way up the layers in an awkwa
sgurun-gerrit only 2013/02/22 01:48:07 I talked to Martin and got his idea about this par
mkosiba (inactive) 2013/02/22 15:35:56 The static method was my suggestion - I believe at
sgurun-gerrit only 2013/02/22 19:31:31 I am doing the change -- Maybe I did not understan
+ if (error_handler) {
+ error_handler->AllowCertificateError(cert_error, ssl_info.cert, request_url,
+ callback, cancel_request);
+ } else {
+ *cancel_request = true;
+ }
}
WebKit::WebNotificationPresenter::Permission

Powered by Google App Engine
This is Rietveld 408576698