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

Side by Side Diff: android_webview/browser/aw_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 ANDROID_WEBVIEW_LIB_AW_CONTENT_BROWSER_CLIENT_H_ 5 #ifndef ANDROID_WEBVIEW_LIB_AW_CONTENT_BROWSER_CLIENT_H_
6 #define ANDROID_WEBVIEW_LIB_AW_CONTENT_BROWSER_CLIENT_H_ 6 #define ANDROID_WEBVIEW_LIB_AW_CONTENT_BROWSER_CLIENT_H_
7 7
8 #include "android_webview/browser/aw_web_preferences_populater.h" 8 #include "android_webview/browser/aw_web_preferences_populater.h"
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 const std::vector<std::pair<int, int> >& render_frames) OVERRIDE; 91 const std::vector<std::pair<int, int> >& render_frames) OVERRIDE;
92 virtual content::QuotaPermissionContext* 92 virtual content::QuotaPermissionContext*
93 CreateQuotaPermissionContext() OVERRIDE; 93 CreateQuotaPermissionContext() OVERRIDE;
94 virtual void AllowCertificateError( 94 virtual void AllowCertificateError(
95 int render_process_id, 95 int render_process_id,
96 int render_frame_id, 96 int render_frame_id,
97 int cert_error, 97 int cert_error,
98 const net::SSLInfo& ssl_info, 98 const net::SSLInfo& ssl_info,
99 const GURL& request_url, 99 const GURL& request_url,
100 content::ResourceType resource_type, 100 content::ResourceType resource_type,
101 bool overridable, 101 int options_mask,
102 bool strict_enforcement,
103 bool expired_previous_decision,
104 const base::Callback<void(bool)>& callback, 102 const base::Callback<void(bool)>& callback,
105 content::CertificateRequestResultType* result) OVERRIDE; 103 content::CertificateRequestResultType* result) OVERRIDE;
106 virtual void SelectClientCertificate( 104 virtual void SelectClientCertificate(
107 int render_process_id, 105 int render_process_id,
108 int render_frame_id, 106 int render_frame_id,
109 const net::HttpNetworkSession* network_session, 107 const net::HttpNetworkSession* network_session,
110 net::SSLCertRequestInfo* cert_request_info, 108 net::SSLCertRequestInfo* cert_request_info,
111 const base::Callback<void(net::X509Certificate*)>& callback) OVERRIDE; 109 const base::Callback<void(net::X509Certificate*)>& callback) OVERRIDE;
112 virtual blink::WebNotificationPermission 110 virtual blink::WebNotificationPermission
113 CheckDesktopNotificationPermission( 111 CheckDesktopNotificationPermission(
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 scoped_ptr<AwWebPreferencesPopulater> preferences_populater_; 181 scoped_ptr<AwWebPreferencesPopulater> preferences_populater_;
184 182
185 JniDependencyFactory* native_factory_; 183 JniDependencyFactory* native_factory_;
186 184
187 DISALLOW_COPY_AND_ASSIGN(AwContentBrowserClient); 185 DISALLOW_COPY_AND_ASSIGN(AwContentBrowserClient);
188 }; 186 };
189 187
190 } // namespace android_webview 188 } // namespace android_webview
191 189
192 #endif // ANDROID_WEBVIEW_LIB_AW_CONTENT_BROWSER_CLIENT_H_ 190 #endif // ANDROID_WEBVIEW_LIB_AW_CONTENT_BROWSER_CLIENT_H_
OLDNEW
« no previous file with comments | « no previous file | android_webview/browser/aw_content_browser_client.cc » ('j') | chrome/browser/chrome_content_browser_client.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698