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

Side by Side Diff: chrome/browser/chrome_content_browser_client.h

Issue 2848313003: Revert of Remove client_certs from SSLCertRequestInfo. (Closed)
Patch Set: Created 3 years, 7 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) 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 CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ 5 #ifndef CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
6 #define CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ 6 #define CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 const GURL& request_url, 190 const GURL& request_url,
191 content::ResourceType resource_type, 191 content::ResourceType resource_type,
192 bool overridable, 192 bool overridable,
193 bool strict_enforcement, 193 bool strict_enforcement,
194 bool expired_previous_decision, 194 bool expired_previous_decision,
195 const base::Callback<void(content::CertificateRequestResultType)>& 195 const base::Callback<void(content::CertificateRequestResultType)>&
196 callback) override; 196 callback) override;
197 void SelectClientCertificate( 197 void SelectClientCertificate(
198 content::WebContents* web_contents, 198 content::WebContents* web_contents,
199 net::SSLCertRequestInfo* cert_request_info, 199 net::SSLCertRequestInfo* cert_request_info,
200 net::CertificateList client_certs,
201 std::unique_ptr<content::ClientCertificateDelegate> delegate) override; 200 std::unique_ptr<content::ClientCertificateDelegate> delegate) override;
202 content::MediaObserver* GetMediaObserver() override; 201 content::MediaObserver* GetMediaObserver() override;
203 content::PlatformNotificationService* GetPlatformNotificationService() 202 content::PlatformNotificationService* GetPlatformNotificationService()
204 override; 203 override;
205 bool CanCreateWindow(content::RenderFrameHost* opener, 204 bool CanCreateWindow(content::RenderFrameHost* opener,
206 const GURL& opener_url, 205 const GURL& opener_url,
207 const GURL& opener_top_level_frame_url, 206 const GURL& opener_top_level_frame_url,
208 const GURL& source_origin, 207 const GURL& source_origin,
209 content::mojom::WindowContainerType container_type, 208 content::mojom::WindowContainerType container_type,
210 const GURL& target_url, 209 const GURL& target_url,
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
385 std::vector<ChromeContentBrowserClientParts*> extra_parts_; 384 std::vector<ChromeContentBrowserClientParts*> extra_parts_;
386 385
387 service_manager::BinderRegistry gpu_binder_registry_; 386 service_manager::BinderRegistry gpu_binder_registry_;
388 387
389 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_; 388 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_;
390 389
391 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); 390 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient);
392 }; 391 };
393 392
394 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ 393 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
OLDNEW
« no previous file with comments | « android_webview/browser/aw_content_browser_client.cc ('k') | chrome/browser/chrome_content_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698