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

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

Issue 302653006: Remove use of ResourceRequestInfo::GetRequestID from cert enrollment. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase again. Created 6 years, 6 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 | « chrome/app/generated_resources.grd ('k') | chrome/browser/chrome_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 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 <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 bool overridable, 182 bool overridable,
183 bool strict_enforcement, 183 bool strict_enforcement,
184 const base::Callback<void(bool)>& callback, 184 const base::Callback<void(bool)>& callback,
185 content::CertificateRequestResultType* request) OVERRIDE; 185 content::CertificateRequestResultType* request) OVERRIDE;
186 virtual void SelectClientCertificate( 186 virtual void SelectClientCertificate(
187 int render_process_id, 187 int render_process_id,
188 int render_frame_id, 188 int render_frame_id,
189 const net::HttpNetworkSession* network_session, 189 const net::HttpNetworkSession* network_session,
190 net::SSLCertRequestInfo* cert_request_info, 190 net::SSLCertRequestInfo* cert_request_info,
191 const base::Callback<void(net::X509Certificate*)>& callback) OVERRIDE; 191 const base::Callback<void(net::X509Certificate*)>& callback) OVERRIDE;
192 virtual void AddCertificate( 192 virtual void AddCertificate(net::CertificateMimeType cert_type,
193 net::URLRequest* request, 193 const void* cert_data,
194 net::CertificateMimeType cert_type, 194 size_t cert_size,
195 const void* cert_data, 195 int render_process_id,
196 size_t cert_size, 196 int render_frame_id) OVERRIDE;
197 int render_process_id,
198 int render_view_id) OVERRIDE;
199 virtual content::MediaObserver* GetMediaObserver() OVERRIDE; 197 virtual content::MediaObserver* GetMediaObserver() OVERRIDE;
200 virtual void RequestDesktopNotificationPermission( 198 virtual void RequestDesktopNotificationPermission(
201 const GURL& source_origin, 199 const GURL& source_origin,
202 content::RenderFrameHost* render_frame_host, 200 content::RenderFrameHost* render_frame_host,
203 const base::Closure& callback) OVERRIDE; 201 const base::Closure& callback) OVERRIDE;
204 virtual blink::WebNotificationPresenter::Permission 202 virtual blink::WebNotificationPresenter::Permission
205 CheckDesktopNotificationPermission( 203 CheckDesktopNotificationPermission(
206 const GURL& source_origin, 204 const GURL& source_origin,
207 content::ResourceContext* context, 205 content::ResourceContext* context,
208 int render_process_id) OVERRIDE; 206 int render_process_id) OVERRIDE;
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
315 prerender::PrerenderTracker* prerender_tracker_; 313 prerender::PrerenderTracker* prerender_tracker_;
316 314
317 friend class DisableWebRtcEncryptionFlagTest; 315 friend class DisableWebRtcEncryptionFlagTest;
318 316
319 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); 317 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient);
320 }; 318 };
321 319
322 } // namespace chrome 320 } // namespace chrome
323 321
324 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ 322 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/chrome_content_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698