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 #ifndef ANDROID_WEBVIEW_LIB_AW_CONTENT_BROWSER_CLIENT_H_ | 5 #ifndef ANDROID_WEBVIEW_LIB_AW_CONTENT_BROWSER_CLIENT_H_ |
6 #define ANDROID_WEBVIEW_LIB_AW_CONTENT_BROWSER_CLIENT_H_ | 6 #define ANDROID_WEBVIEW_LIB_AW_CONTENT_BROWSER_CLIENT_H_ |
7 | 7 |
8 #include "android_webview/browser/aw_web_preferences_populater.h" | 8 #include "android_webview/browser/aw_web_preferences_populater.h" |
9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
10 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
99 const GURL& request_url, | 99 const GURL& request_url, |
100 content::ResourceType resource_type, | 100 content::ResourceType resource_type, |
101 bool overridable, | 101 bool overridable, |
102 bool strict_enforcement, | 102 bool strict_enforcement, |
103 bool expired_previous_decision, | 103 bool expired_previous_decision, |
104 const base::Callback<void(bool)>& callback, | 104 const base::Callback<void(bool)>& callback, |
105 content::CertificateRequestResultType* result) override; | 105 content::CertificateRequestResultType* result) override; |
106 virtual void SelectClientCertificate( | 106 virtual void SelectClientCertificate( |
107 int render_process_id, | 107 int render_process_id, |
108 int render_frame_id, | 108 int render_frame_id, |
| 109 const net::HttpNetworkSession* network_session, |
109 net::SSLCertRequestInfo* cert_request_info, | 110 net::SSLCertRequestInfo* cert_request_info, |
110 const base::Callback<void(net::X509Certificate*)>& callback) override; | 111 const base::Callback<void(net::X509Certificate*)>& callback) override; |
111 virtual void RequestPermission( | 112 virtual void RequestPermission( |
112 content::PermissionType permission, | 113 content::PermissionType permission, |
113 content::WebContents* web_contents, | 114 content::WebContents* web_contents, |
114 int bridge_id, | 115 int bridge_id, |
115 const GURL& requesting_frame, | 116 const GURL& requesting_frame, |
116 bool user_gesture, | 117 bool user_gesture, |
117 const base::Callback<void(bool)>& result_callback) override; | 118 const base::Callback<void(bool)>& result_callback) override; |
118 virtual void CancelPermissionRequest(content::PermissionType permission, | 119 virtual void CancelPermissionRequest(content::PermissionType permission, |
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
166 scoped_ptr<AwWebPreferencesPopulater> preferences_populater_; | 167 scoped_ptr<AwWebPreferencesPopulater> preferences_populater_; |
167 | 168 |
168 JniDependencyFactory* native_factory_; | 169 JniDependencyFactory* native_factory_; |
169 | 170 |
170 DISALLOW_COPY_AND_ASSIGN(AwContentBrowserClient); | 171 DISALLOW_COPY_AND_ASSIGN(AwContentBrowserClient); |
171 }; | 172 }; |
172 | 173 |
173 } // namespace android_webview | 174 } // namespace android_webview |
174 | 175 |
175 #endif // ANDROID_WEBVIEW_LIB_AW_CONTENT_BROWSER_CLIENT_H_ | 176 #endif // ANDROID_WEBVIEW_LIB_AW_CONTENT_BROWSER_CLIENT_H_ |
OLD | NEW |