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

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

Issue 2220603003: Remove unnecessary |result| argument from AllowCertificateError() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nasko comments 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
« no previous file with comments | « no previous file | android_webview/browser/aw_content_browser_client.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 <stddef.h> 8 #include <stddef.h>
9 9
10 #include <memory> 10 #include <memory>
11 11
12 #include "android_webview/browser/aw_web_preferences_populater.h" 12 #include "android_webview/browser/aw_web_preferences_populater.h"
13 #include "base/compiler_specific.h" 13 #include "base/compiler_specific.h"
14 #include "base/macros.h" 14 #include "base/macros.h"
15 #include "content/public/browser/certificate_request_result_type.h"
boliu 2016/08/08 20:15:48 this include should be in content/public/browser/c
estark 2016/08/09 02:16:49 Done.
15 #include "content/public/browser/content_browser_client.h" 16 #include "content/public/browser/content_browser_client.h"
16 17
17 namespace android_webview { 18 namespace android_webview {
18 19
19 class AwBrowserContext; 20 class AwBrowserContext;
20 class JniDependencyFactory; 21 class JniDependencyFactory;
21 22
22 class AwContentBrowserClient : public content::ContentBrowserClient { 23 class AwContentBrowserClient : public content::ContentBrowserClient {
23 public: 24 public:
24 // This is what AwContentBrowserClient::GetAcceptLangs uses. 25 // This is what AwContentBrowserClient::GetAcceptLangs uses.
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 content::QuotaPermissionContext* CreateQuotaPermissionContext() override; 83 content::QuotaPermissionContext* CreateQuotaPermissionContext() override;
83 void AllowCertificateError( 84 void AllowCertificateError(
84 content::WebContents* web_contents, 85 content::WebContents* web_contents,
85 int cert_error, 86 int cert_error,
86 const net::SSLInfo& ssl_info, 87 const net::SSLInfo& ssl_info,
87 const GURL& request_url, 88 const GURL& request_url,
88 content::ResourceType resource_type, 89 content::ResourceType resource_type,
89 bool overridable, 90 bool overridable,
90 bool strict_enforcement, 91 bool strict_enforcement,
91 bool expired_previous_decision, 92 bool expired_previous_decision,
92 const base::Callback<void(bool)>& callback, 93 const base::Callback<void(content::CertificateRequestResultType)>&
93 content::CertificateRequestResultType* result) override; 94 callback) override;
94 void SelectClientCertificate( 95 void SelectClientCertificate(
95 content::WebContents* web_contents, 96 content::WebContents* web_contents,
96 net::SSLCertRequestInfo* cert_request_info, 97 net::SSLCertRequestInfo* cert_request_info,
97 std::unique_ptr<content::ClientCertificateDelegate> delegate) override; 98 std::unique_ptr<content::ClientCertificateDelegate> delegate) override;
98 bool CanCreateWindow(const GURL& opener_url, 99 bool CanCreateWindow(const GURL& opener_url,
99 const GURL& opener_top_level_frame_url, 100 const GURL& opener_top_level_frame_url,
100 const GURL& source_origin, 101 const GURL& source_origin,
101 WindowContainerType container_type, 102 WindowContainerType container_type,
102 const GURL& target_url, 103 const GURL& target_url,
103 const content::Referrer& referrer, 104 const content::Referrer& referrer,
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 std::unique_ptr<AwWebPreferencesPopulater> preferences_populater_; 149 std::unique_ptr<AwWebPreferencesPopulater> preferences_populater_;
149 150
150 JniDependencyFactory* native_factory_; 151 JniDependencyFactory* native_factory_;
151 152
152 DISALLOW_COPY_AND_ASSIGN(AwContentBrowserClient); 153 DISALLOW_COPY_AND_ASSIGN(AwContentBrowserClient);
153 }; 154 };
154 155
155 } // namespace android_webview 156 } // namespace android_webview
156 157
157 #endif // ANDROID_WEBVIEW_LIB_AW_CONTENT_BROWSER_CLIENT_H_ 158 #endif // ANDROID_WEBVIEW_LIB_AW_CONTENT_BROWSER_CLIENT_H_
OLDNEW
« no previous file with comments | « no previous file | android_webview/browser/aw_content_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698