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 578373002: Interstitial options are not OR'd properly. (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: Changed API to pass options_mask through Created 6 years, 3 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 (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 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 const GURL& url, content::ResourceContext* context) OVERRIDE; 158 const GURL& url, content::ResourceContext* context) OVERRIDE;
159 virtual content::QuotaPermissionContext* 159 virtual content::QuotaPermissionContext*
160 CreateQuotaPermissionContext() OVERRIDE; 160 CreateQuotaPermissionContext() OVERRIDE;
161 virtual void AllowCertificateError( 161 virtual void AllowCertificateError(
162 int render_process_id, 162 int render_process_id,
163 int render_frame_id, 163 int render_frame_id,
164 int cert_error, 164 int cert_error,
165 const net::SSLInfo& ssl_info, 165 const net::SSLInfo& ssl_info,
166 const GURL& request_url, 166 const GURL& request_url,
167 content::ResourceType resource_type, 167 content::ResourceType resource_type,
168 bool overridable, 168 int options_mask,
169 bool strict_enforcement,
170 bool expired_previous_decision,
171 const base::Callback<void(bool)>& callback, 169 const base::Callback<void(bool)>& callback,
172 content::CertificateRequestResultType* request) OVERRIDE; 170 content::CertificateRequestResultType* request) OVERRIDE;
173 virtual void SelectClientCertificate( 171 virtual void SelectClientCertificate(
174 int render_process_id, 172 int render_process_id,
175 int render_frame_id, 173 int render_frame_id,
176 const net::HttpNetworkSession* network_session, 174 const net::HttpNetworkSession* network_session,
177 net::SSLCertRequestInfo* cert_request_info, 175 net::SSLCertRequestInfo* cert_request_info,
178 const base::Callback<void(net::X509Certificate*)>& callback) OVERRIDE; 176 const base::Callback<void(net::X509Certificate*)>& callback) OVERRIDE;
179 virtual void AddCertificate(net::CertificateMimeType cert_type, 177 virtual void AddCertificate(net::CertificateMimeType cert_type,
180 const void* cert_data, 178 const void* cert_data,
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
349 std::vector<ChromeContentBrowserClientParts*> extra_parts_; 347 std::vector<ChromeContentBrowserClientParts*> extra_parts_;
350 348
351 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_; 349 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_;
352 350
353 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); 351 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient);
354 }; 352 };
355 353
356 } // namespace chrome 354 } // namespace chrome
357 355
358 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ 356 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698