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

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: fix aura 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
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 SSLCertErrorHandler; 27 class SSLCertErrorHandler;
28 class SSLClientAuthHandler;
29 class SkBitmap; 28 class SkBitmap;
30 struct WebPreferences; 29 struct WebPreferences;
31 30
32 namespace content { 31 namespace content {
33 class AccessTokenStore; 32 class AccessTokenStore;
34 class BrowserMainParts; 33 class BrowserMainParts;
35 class RenderProcessHost; 34 class RenderProcessHost;
36 class SiteInstance; 35 class SiteInstance;
37 class WebContents; 36 class WebContents;
38 class WebContentsView; 37 class WebContentsView;
39 struct MainFunctionParams; 38 struct MainFunctionParams;
40 struct ShowDesktopNotificationHostMsgParams; 39 struct ShowDesktopNotificationHostMsgParams;
41 } 40 }
42 41
43 namespace crypto { 42 namespace crypto {
44 class CryptoModuleBlockingPasswordDelegate; 43 class CryptoModuleBlockingPasswordDelegate;
45 } 44 }
46 45
47 namespace net { 46 namespace net {
48 class CookieList; 47 class CookieList;
49 class CookieOptions; 48 class CookieOptions;
49 class HttpNetworkSession;
50 class NetLog; 50 class NetLog;
51 class SSLCertRequestInfo;
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
60 namespace ui { 61 namespace ui {
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 219
219 // Informs the embedder that a certificate error has occured. If overridable 220 // Informs the embedder that a certificate error has occured. If overridable
220 // is true, the user can ignore the error and continue. If it's false, then 221 // is true, the user can ignore the error and continue. If it's false, then
221 // the certificate error is severe and the user isn't allowed to proceed. The 222 // the certificate error is severe and the user isn't allowed to proceed. The
222 // embedder can call the callback asynchronously. 223 // embedder can call the callback asynchronously.
223 virtual void AllowCertificateError( 224 virtual void AllowCertificateError(
224 SSLCertErrorHandler* handler, 225 SSLCertErrorHandler* handler,
225 bool overridable, 226 bool overridable,
226 const base::Callback<void(SSLCertErrorHandler*, bool)>& callback) = 0; 227 const base::Callback<void(SSLCertErrorHandler*, bool)>& callback) = 0;
227 228
228 // Selects a SSL client certificate and returns it to the |handler|. If no 229 // Selects a SSL client certificate and returns it to the |callback|. If no
229 // certificate was selected NULL is returned to the |handler|. 230 // certificate was selected NULL is returned to the |callback|.
230 virtual void SelectClientCertificate( 231 virtual void SelectClientCertificate(
231 int render_process_id, 232 int render_process_id,
232 int render_view_id, 233 int render_view_id,
233 SSLClientAuthHandler* handler) = 0; 234 const net::HttpNetworkSession* network_session,
235 net::SSLCertRequestInfo* cert_request_info,
236 const base::Callback<void(net::X509Certificate*)>& callback) = 0;
234 237
235 // Adds a downloaded client cert. The embedder should ensure that there's 238 // Adds a downloaded client cert. The embedder should ensure that there's
236 // a private key for the cert, displays the cert to the user, and adds it upon 239 // a private key for the cert, displays the cert to the user, and adds it upon
237 // user approval. If the downloaded data could not be interpreted as a valid 240 // user approval. If the downloaded data could not be interpreted as a valid
238 // certificate, |cert| will be NULL. 241 // certificate, |cert| will be NULL.
239 virtual void AddNewCertificate( 242 virtual void AddNewCertificate(
240 net::URLRequest* request, 243 net::URLRequest* request,
241 net::X509Certificate* cert, 244 net::X509Certificate* cert,
242 int render_process_id, 245 int render_process_id,
243 int render_view_id) = 0; 246 int render_view_id) = 0;
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
350 // This is called on a worker thread. 353 // This is called on a worker thread.
351 virtual 354 virtual
352 crypto::CryptoModuleBlockingPasswordDelegate* GetCryptoPasswordDelegate( 355 crypto::CryptoModuleBlockingPasswordDelegate* GetCryptoPasswordDelegate(
353 const GURL& url) = 0; 356 const GURL& url) = 0;
354 #endif 357 #endif
355 }; 358 };
356 359
357 } // namespace content 360 } // namespace content
358 361
359 #endif // CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_ 362 #endif // CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698