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

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

Issue 370833002: Move resource_type.* from webkit/ to content/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: chromeos fix Created 6 years, 5 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 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 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 virtual net::URLRequestContext* OverrideRequestContextForURL( 160 virtual net::URLRequestContext* OverrideRequestContextForURL(
161 const GURL& url, content::ResourceContext* context) OVERRIDE; 161 const GURL& url, content::ResourceContext* context) OVERRIDE;
162 virtual content::QuotaPermissionContext* 162 virtual content::QuotaPermissionContext*
163 CreateQuotaPermissionContext() OVERRIDE; 163 CreateQuotaPermissionContext() OVERRIDE;
164 virtual void AllowCertificateError( 164 virtual void AllowCertificateError(
165 int render_process_id, 165 int render_process_id,
166 int render_frame_id, 166 int render_frame_id,
167 int cert_error, 167 int cert_error,
168 const net::SSLInfo& ssl_info, 168 const net::SSLInfo& ssl_info,
169 const GURL& request_url, 169 const GURL& request_url,
170 ResourceType::Type resource_type, 170 content::ResourceType::Type resource_type,
171 bool overridable, 171 bool overridable,
172 bool strict_enforcement, 172 bool strict_enforcement,
173 const base::Callback<void(bool)>& callback, 173 const base::Callback<void(bool)>& callback,
174 content::CertificateRequestResultType* request) OVERRIDE; 174 content::CertificateRequestResultType* request) OVERRIDE;
175 virtual void SelectClientCertificate( 175 virtual void SelectClientCertificate(
176 int render_process_id, 176 int render_process_id,
177 int render_frame_id, 177 int render_frame_id,
178 const net::HttpNetworkSession* network_session, 178 const net::HttpNetworkSession* network_session,
179 net::SSLCertRequestInfo* cert_request_info, 179 net::SSLCertRequestInfo* cert_request_info,
180 const base::Callback<void(net::X509Certificate*)>& callback) OVERRIDE; 180 const base::Callback<void(net::X509Certificate*)>& callback) OVERRIDE;
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
323 prerender::PrerenderTracker* prerender_tracker_; 323 prerender::PrerenderTracker* prerender_tracker_;
324 324
325 friend class DisableWebRtcEncryptionFlagTest; 325 friend class DisableWebRtcEncryptionFlagTest;
326 326
327 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); 327 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient);
328 }; 328 };
329 329
330 } // namespace chrome 330 } // namespace chrome
331 331
332 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ 332 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698