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

Side by Side Diff: content/shell/browser/shell_content_browser_client.h

Issue 859213006: Cancel client auth requests when not promptable. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@client-auth-cancel-1
Patch Set: worker_common.js was missing a license header (also a rebase) Created 5 years, 9 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_ 5 #ifndef CONTENT_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_
6 #define CONTENT_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_ 6 #define CONTENT_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 void AppendExtraCommandLineSwitches(base::CommandLine* command_line, 47 void AppendExtraCommandLineSwitches(base::CommandLine* command_line,
48 int child_process_id) override; 48 int child_process_id) override;
49 void OverrideWebkitPrefs(RenderViewHost* render_view_host, 49 void OverrideWebkitPrefs(RenderViewHost* render_view_host,
50 WebPreferences* prefs) override; 50 WebPreferences* prefs) override;
51 void ResourceDispatcherHostCreated() override; 51 void ResourceDispatcherHostCreated() override;
52 AccessTokenStore* CreateAccessTokenStore() override; 52 AccessTokenStore* CreateAccessTokenStore() override;
53 std::string GetDefaultDownloadName() override; 53 std::string GetDefaultDownloadName() override;
54 WebContentsViewDelegate* GetWebContentsViewDelegate( 54 WebContentsViewDelegate* GetWebContentsViewDelegate(
55 WebContents* web_contents) override; 55 WebContents* web_contents) override;
56 QuotaPermissionContext* CreateQuotaPermissionContext() override; 56 QuotaPermissionContext* CreateQuotaPermissionContext() override;
57 void SelectClientCertificate(
58 WebContents* web_contents,
59 net::SSLCertRequestInfo* cert_request_info,
60 scoped_ptr<ClientCertificateDelegate> delegate) override;
57 void RequestPermission( 61 void RequestPermission(
58 PermissionType permission, 62 PermissionType permission,
59 WebContents* web_contents, 63 WebContents* web_contents,
60 int bridge_id, 64 int bridge_id,
61 const GURL& requesting_frame, 65 const GURL& requesting_frame,
62 bool user_gesture, 66 bool user_gesture,
63 const base::Callback<void(PermissionStatus)>& callback) override; 67 const base::Callback<void(PermissionStatus)>& callback) override;
64 68
65 SpeechRecognitionManagerDelegate* CreateSpeechRecognitionManagerDelegate() 69 SpeechRecognitionManagerDelegate* CreateSpeechRecognitionManagerDelegate()
66 override; 70 override;
(...skipping 20 matching lines...) Expand all
87 91
88 ShellBrowserContext* browser_context(); 92 ShellBrowserContext* browser_context();
89 ShellBrowserContext* off_the_record_browser_context(); 93 ShellBrowserContext* off_the_record_browser_context();
90 ShellResourceDispatcherHostDelegate* resource_dispatcher_host_delegate() { 94 ShellResourceDispatcherHostDelegate* resource_dispatcher_host_delegate() {
91 return resource_dispatcher_host_delegate_.get(); 95 return resource_dispatcher_host_delegate_.get();
92 } 96 }
93 ShellBrowserMainParts* shell_browser_main_parts() { 97 ShellBrowserMainParts* shell_browser_main_parts() {
94 return shell_browser_main_parts_; 98 return shell_browser_main_parts_;
95 } 99 }
96 100
101 // Used for content_browsertests.
102 void set_select_client_certificate_callback(
103 base::Closure select_client_certificate_callback) {
104 select_client_certificate_callback_ = select_client_certificate_callback;
105 }
106
97 private: 107 private:
98 ShellBrowserContext* ShellBrowserContextForBrowserContext( 108 ShellBrowserContext* ShellBrowserContextForBrowserContext(
99 BrowserContext* content_browser_context); 109 BrowserContext* content_browser_context);
100 110
101 scoped_ptr<ShellResourceDispatcherHostDelegate> 111 scoped_ptr<ShellResourceDispatcherHostDelegate>
102 resource_dispatcher_host_delegate_; 112 resource_dispatcher_host_delegate_;
103 113
104 #if defined(OS_POSIX) && !defined(OS_MACOSX) 114 #if defined(OS_POSIX) && !defined(OS_MACOSX)
105 base::ScopedFD v8_natives_fd_; 115 base::ScopedFD v8_natives_fd_;
106 base::ScopedFD v8_snapshot_fd_; 116 base::ScopedFD v8_snapshot_fd_;
107 #endif 117 #endif
108 118
119 base::Closure select_client_certificate_callback_;
120
109 ShellBrowserMainParts* shell_browser_main_parts_; 121 ShellBrowserMainParts* shell_browser_main_parts_;
110 }; 122 };
111 123
112 } // namespace content 124 } // namespace content
113 125
114 #endif // CONTENT_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_ 126 #endif // CONTENT_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_
OLDNEW
« no previous file with comments | « content/public/browser/content_browser_client.cc ('k') | content/shell/browser/shell_content_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698