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

Side by Side Diff: android_webview/browser/aw_content_browser_client.cc

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 #include "android_webview/browser/aw_content_browser_client.h" 5 #include "android_webview/browser/aw_content_browser_client.h"
6 6
7 #include "android_webview/browser/aw_browser_context.h" 7 #include "android_webview/browser/aw_browser_context.h"
8 #include "android_webview/browser/aw_browser_main_parts.h" 8 #include "android_webview/browser/aw_browser_main_parts.h"
9 #include "android_webview/browser/aw_browser_permission_request_delegate.h" 9 #include "android_webview/browser/aw_browser_permission_request_delegate.h"
10 #include "android_webview/browser/aw_contents_client_bridge_base.h" 10 #include "android_webview/browser/aw_contents_client_bridge_base.h"
(...skipping 345 matching lines...) Expand 10 before | Expand all | Expand 10 after
356 return new AwQuotaPermissionContext; 356 return new AwQuotaPermissionContext;
357 } 357 }
358 358
359 void AwContentBrowserClient::AllowCertificateError( 359 void AwContentBrowserClient::AllowCertificateError(
360 int render_process_id, 360 int render_process_id,
361 int render_frame_id, 361 int render_frame_id,
362 int cert_error, 362 int cert_error,
363 const net::SSLInfo& ssl_info, 363 const net::SSLInfo& ssl_info,
364 const GURL& request_url, 364 const GURL& request_url,
365 ResourceType resource_type, 365 ResourceType resource_type,
366 bool overridable, 366 int options_mask,
367 bool strict_enforcement,
368 bool expired_previous_decision,
369 const base::Callback<void(bool)>& callback, 367 const base::Callback<void(bool)>& callback,
370 content::CertificateRequestResultType* result) { 368 content::CertificateRequestResultType* result) {
371 AwContentsClientBridgeBase* client = 369 AwContentsClientBridgeBase* client =
372 AwContentsClientBridgeBase::FromID(render_process_id, render_frame_id); 370 AwContentsClientBridgeBase::FromID(render_process_id, render_frame_id);
373 bool cancel_request = true; 371 bool cancel_request = true;
374 if (client) 372 if (client)
375 client->AllowCertificateError(cert_error, 373 client->AllowCertificateError(cert_error,
376 ssl_info.cert.get(), 374 ssl_info.cert.get(),
377 request_url, 375 request_url,
378 callback, 376 callback,
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
574 572
575 #if defined(VIDEO_HOLE) 573 #if defined(VIDEO_HOLE)
576 content::ExternalVideoSurfaceContainer* 574 content::ExternalVideoSurfaceContainer*
577 AwContentBrowserClient::OverrideCreateExternalVideoSurfaceContainer( 575 AwContentBrowserClient::OverrideCreateExternalVideoSurfaceContainer(
578 content::WebContents* web_contents) { 576 content::WebContents* web_contents) {
579 return native_factory_->CreateExternalVideoSurfaceContainer(web_contents); 577 return native_factory_->CreateExternalVideoSurfaceContainer(web_contents);
580 } 578 }
581 #endif 579 #endif
582 580
583 } // namespace android_webview 581 } // namespace android_webview
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698