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

Side by Side Diff: content/public/browser/content_browser_client.h

Issue 9384014: Remove knowledge about SSLClientAuthHandler from chrome. Instead a callback is given to the embed... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: review comments+sync Created 8 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/content_browser.gypi ('k') | content/public/browser/notification_types.h » ('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 CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_ 5 #ifndef CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_
6 #define CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_ 6 #define CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
11 #include <vector> 11 #include <vector>
12 12
13 #include "base/callback_forward.h" 13 #include "base/callback_forward.h"
14 #include "content/public/common/content_client.h" 14 #include "content/public/common/content_client.h"
15 #include "content/public/common/window_container_type.h" 15 #include "content/public/common/window_container_type.h"
16 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNotificationPresen ter.h" 16 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNotificationPresen ter.h"
17 17
18 class BrowserURLHandler; 18 class BrowserURLHandler;
19 class CommandLine; 19 class CommandLine;
20 class FilePath; 20 class FilePath;
21 class GURL; 21 class GURL;
22 class MHTMLGenerationManager; 22 class MHTMLGenerationManager;
23 class PluginProcessHost; 23 class PluginProcessHost;
24 class QuotaPermissionContext; 24 class QuotaPermissionContext;
25 class RenderViewHost; 25 class RenderViewHost;
26 class ResourceDispatcherHost; 26 class ResourceDispatcherHost;
27 class SSLClientAuthHandler;
28 class SkBitmap; 27 class SkBitmap;
29 struct WebPreferences; 28 struct WebPreferences;
30 29
31 namespace content { 30 namespace content {
32 class AccessTokenStore; 31 class AccessTokenStore;
33 class BrowserMainParts; 32 class BrowserMainParts;
34 class RenderProcessHost; 33 class RenderProcessHost;
35 class SiteInstance; 34 class SiteInstance;
36 class WebContents; 35 class WebContents;
37 class WebContentsView; 36 class WebContentsView;
38 struct MainFunctionParams; 37 struct MainFunctionParams;
39 struct ShowDesktopNotificationHostMsgParams; 38 struct ShowDesktopNotificationHostMsgParams;
40 } 39 }
41 40
42 namespace crypto { 41 namespace crypto {
43 class CryptoModuleBlockingPasswordDelegate; 42 class CryptoModuleBlockingPasswordDelegate;
44 } 43 }
45 44
46 namespace net { 45 namespace net {
47 class CookieList; 46 class CookieList;
48 class CookieOptions; 47 class CookieOptions;
48 class HttpNetworkSession;
49 class NetLog; 49 class NetLog;
50 class SSLCertRequestInfo;
50 class SSLInfo; 51 class SSLInfo;
51 class URLRequest; 52 class URLRequest;
52 class URLRequestContext; 53 class URLRequestContext;
53 class X509Certificate; 54 class X509Certificate;
54 } 55 }
55 56
56 namespace speech_input { 57 namespace speech_input {
57 class SpeechInputManager; 58 class SpeechInputManager;
58 } 59 }
59 60
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 virtual void AllowCertificateError( 226 virtual void AllowCertificateError(
226 int render_process_id, 227 int render_process_id,
227 int render_view_id, 228 int render_view_id,
228 int cert_error, 229 int cert_error,
229 const net::SSLInfo& ssl_info, 230 const net::SSLInfo& ssl_info,
230 const GURL& request_url, 231 const GURL& request_url,
231 bool overridable, 232 bool overridable,
232 const base::Callback<void(bool)>& callback, 233 const base::Callback<void(bool)>& callback,
233 bool* cancel_request) = 0; 234 bool* cancel_request) = 0;
234 235
235 // Selects a SSL client certificate and returns it to the |handler|. If no 236 // Selects a SSL client certificate and returns it to the |callback|. If no
236 // certificate was selected NULL is returned to the |handler|. 237 // certificate was selected NULL is returned to the |callback|.
237 virtual void SelectClientCertificate( 238 virtual void SelectClientCertificate(
238 int render_process_id, 239 int render_process_id,
239 int render_view_id, 240 int render_view_id,
240 SSLClientAuthHandler* handler) = 0; 241 const net::HttpNetworkSession* network_session,
242 net::SSLCertRequestInfo* cert_request_info,
243 const base::Callback<void(net::X509Certificate*)>& callback) = 0;
241 244
242 // Adds a downloaded client cert. The embedder should ensure that there's 245 // Adds a downloaded client cert. The embedder should ensure that there's
243 // a private key for the cert, displays the cert to the user, and adds it upon 246 // a private key for the cert, displays the cert to the user, and adds it upon
244 // user approval. If the downloaded data could not be interpreted as a valid 247 // user approval. If the downloaded data could not be interpreted as a valid
245 // certificate, |cert| will be NULL. 248 // certificate, |cert| will be NULL.
246 virtual void AddNewCertificate( 249 virtual void AddNewCertificate(
247 net::URLRequest* request, 250 net::URLRequest* request,
248 net::X509Certificate* cert, 251 net::X509Certificate* cert,
249 int render_process_id, 252 int render_process_id,
250 int render_view_id) = 0; 253 int render_view_id) = 0;
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
357 // This is called on a worker thread. 360 // This is called on a worker thread.
358 virtual 361 virtual
359 crypto::CryptoModuleBlockingPasswordDelegate* GetCryptoPasswordDelegate( 362 crypto::CryptoModuleBlockingPasswordDelegate* GetCryptoPasswordDelegate(
360 const GURL& url) = 0; 363 const GURL& url) = 0;
361 #endif 364 #endif
362 }; 365 };
363 366
364 } // namespace content 367 } // namespace content
365 368
366 #endif // CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_ 369 #endif // CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_
OLDNEW
« no previous file with comments | « content/content_browser.gypi ('k') | content/public/browser/notification_types.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698