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

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

Issue 1417173010: Adding <keygen> Content Setting (core) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removing keygen_rules. Created 5 years, 1 month 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 (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 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 const base::string16& name, 162 const base::string16& name,
163 content::ResourceContext* context, 163 content::ResourceContext* context,
164 const std::vector<std::pair<int, int>>& render_frames) override; 164 const std::vector<std::pair<int, int>>& render_frames) override;
165 165
166 #if defined(ENABLE_WEBRTC) 166 #if defined(ENABLE_WEBRTC)
167 bool AllowWebRTCIdentityCache(const GURL& url, 167 bool AllowWebRTCIdentityCache(const GURL& url,
168 const GURL& first_party_url, 168 const GURL& first_party_url,
169 content::ResourceContext* context) override; 169 content::ResourceContext* context) override;
170 #endif // defined(ENABLE_WEBRTC) 170 #endif // defined(ENABLE_WEBRTC)
171 171
172 bool AllowKeygen(const GURL& url, content::ResourceContext* context) override;
173
172 net::URLRequestContext* OverrideRequestContextForURL( 174 net::URLRequestContext* OverrideRequestContextForURL(
173 const GURL& url, 175 const GURL& url,
174 content::ResourceContext* context) override; 176 content::ResourceContext* context) override;
175 content::QuotaPermissionContext* CreateQuotaPermissionContext() override; 177 content::QuotaPermissionContext* CreateQuotaPermissionContext() override;
176 void AllowCertificateError( 178 void AllowCertificateError(
177 int render_process_id, 179 int render_process_id,
178 int render_frame_id, 180 int render_frame_id,
179 int cert_error, 181 int cert_error,
180 const net::SSLInfo& ssl_info, 182 const net::SSLInfo& ssl_info,
181 const GURL& request_url, 183 const GURL& request_url,
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
338 // Vector of additional ChromeContentBrowserClientParts. 340 // Vector of additional ChromeContentBrowserClientParts.
339 // Parts are deleted in the reverse order they are added. 341 // Parts are deleted in the reverse order they are added.
340 std::vector<ChromeContentBrowserClientParts*> extra_parts_; 342 std::vector<ChromeContentBrowserClientParts*> extra_parts_;
341 343
342 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_; 344 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_;
343 345
344 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); 346 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient);
345 }; 347 };
346 348
347 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ 349 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698