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

Side by Side Diff: android_webview/browser/aw_contents_client_bridge_base.h

Issue 2220603003: Remove unnecessary |result| argument from AllowCertificateError() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: android fix Created 4 years, 4 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 #ifndef ANDROID_WEBVIEW_BROWSER_AW_CONTENTS_CLIENT_BRIDGE_BASE_H_ 5 #ifndef ANDROID_WEBVIEW_BROWSER_AW_CONTENTS_CLIENT_BRIDGE_BASE_H_
6 #define ANDROID_WEBVIEW_BROWSER_AW_CONTENTS_CLIENT_BRIDGE_BASE_H_ 6 #define ANDROID_WEBVIEW_BROWSER_AW_CONTENTS_CLIENT_BRIDGE_BASE_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "base/supports_user_data.h" 10 #include "base/supports_user_data.h"
11 #include "content/public/browser/certificate_request_result_type.h"
11 #include "content/public/browser/javascript_dialog_manager.h" 12 #include "content/public/browser/javascript_dialog_manager.h"
12 13
13 class GURL; 14 class GURL;
14 15
15 namespace content { 16 namespace content {
16 class ClientCertificateDelegate; 17 class ClientCertificateDelegate;
17 class WebContents; 18 class WebContents;
18 } 19 }
19 20
20 namespace net { 21 namespace net {
(...skipping 13 matching lines...) Expand all
34 // Adds the handler to the UserData registry. 35 // Adds the handler to the UserData registry.
35 static void Associate(content::WebContents* web_contents, 36 static void Associate(content::WebContents* web_contents,
36 AwContentsClientBridgeBase* handler); 37 AwContentsClientBridgeBase* handler);
37 static AwContentsClientBridgeBase* FromWebContents( 38 static AwContentsClientBridgeBase* FromWebContents(
38 content::WebContents* web_contents); 39 content::WebContents* web_contents);
39 static AwContentsClientBridgeBase* FromID(int render_process_id, 40 static AwContentsClientBridgeBase* FromID(int render_process_id,
40 int render_frame_id); 41 int render_frame_id);
41 42
42 virtual ~AwContentsClientBridgeBase(); 43 virtual ~AwContentsClientBridgeBase();
43 44
44 virtual void AllowCertificateError(int cert_error, 45 virtual void AllowCertificateError(
45 net::X509Certificate* cert, 46 int cert_error,
46 const GURL& request_url, 47 net::X509Certificate* cert,
47 const base::Callback<void(bool)>& callback, 48 const GURL& request_url,
48 bool* cancel_request) = 0; 49 const base::Callback<void(content::CertificateRequestResultType)>&
50 callback,
51 bool* cancel_request) = 0;
49 virtual void SelectClientCertificate( 52 virtual void SelectClientCertificate(
50 net::SSLCertRequestInfo* cert_request_info, 53 net::SSLCertRequestInfo* cert_request_info,
51 std::unique_ptr<content::ClientCertificateDelegate> delegate) = 0; 54 std::unique_ptr<content::ClientCertificateDelegate> delegate) = 0;
52 55
53 virtual void RunJavaScriptDialog( 56 virtual void RunJavaScriptDialog(
54 content::JavaScriptMessageType message_type, 57 content::JavaScriptMessageType message_type,
55 const GURL& origin_url, 58 const GURL& origin_url,
56 const base::string16& message_text, 59 const base::string16& message_text,
57 const base::string16& default_prompt_text, 60 const base::string16& default_prompt_text,
58 const content::JavaScriptDialogManager::DialogClosedCallback& callback) 61 const content::JavaScriptDialogManager::DialogClosedCallback& callback)
59 = 0; 62 = 0;
60 63
61 virtual void RunBeforeUnloadDialog( 64 virtual void RunBeforeUnloadDialog(
62 const GURL& origin_url, 65 const GURL& origin_url,
63 const content::JavaScriptDialogManager::DialogClosedCallback& callback) 66 const content::JavaScriptDialogManager::DialogClosedCallback& callback)
64 = 0; 67 = 0;
65 68
66 virtual bool ShouldOverrideUrlLoading(const base::string16& url, 69 virtual bool ShouldOverrideUrlLoading(const base::string16& url,
67 bool has_user_gesture, 70 bool has_user_gesture,
68 bool is_redirect, 71 bool is_redirect,
69 bool is_main_frame) = 0; 72 bool is_main_frame) = 0;
70 }; 73 };
71 74
72 } // namespace android_webview 75 } // namespace android_webview
73 76
74 #endif // ANDROID_WEBVIEW_BROWSER_AW_CONTENTS_CLIENT_BRIDGE_BASE_H_ 77 #endif // ANDROID_WEBVIEW_BROWSER_AW_CONTENTS_CLIENT_BRIDGE_BASE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698