OLD | NEW |
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 <utility> | 7 #include <utility> |
8 | 8 |
9 #include "android_webview/browser/aw_browser_context.h" | 9 #include "android_webview/browser/aw_browser_context.h" |
10 #include "android_webview/browser/aw_browser_main_parts.h" | 10 #include "android_webview/browser/aw_browser_main_parts.h" |
(...skipping 369 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
380 content::WebContents* web_contents, | 380 content::WebContents* web_contents, |
381 net::SSLCertRequestInfo* cert_request_info, | 381 net::SSLCertRequestInfo* cert_request_info, |
382 std::unique_ptr<content::ClientCertificateDelegate> delegate) { | 382 std::unique_ptr<content::ClientCertificateDelegate> delegate) { |
383 AwContentsClientBridgeBase* client = | 383 AwContentsClientBridgeBase* client = |
384 AwContentsClientBridgeBase::FromWebContents(web_contents); | 384 AwContentsClientBridgeBase::FromWebContents(web_contents); |
385 if (client) | 385 if (client) |
386 client->SelectClientCertificate(cert_request_info, std::move(delegate)); | 386 client->SelectClientCertificate(cert_request_info, std::move(delegate)); |
387 } | 387 } |
388 | 388 |
389 bool AwContentBrowserClient::CanCreateWindow( | 389 bool AwContentBrowserClient::CanCreateWindow( |
| 390 int opener_render_process_id, |
| 391 int opener_render_frame_id, |
390 const GURL& opener_url, | 392 const GURL& opener_url, |
391 const GURL& opener_top_level_frame_url, | 393 const GURL& opener_top_level_frame_url, |
392 const GURL& source_origin, | 394 const GURL& source_origin, |
393 WindowContainerType container_type, | 395 WindowContainerType container_type, |
394 const GURL& target_url, | 396 const GURL& target_url, |
395 const content::Referrer& referrer, | 397 const content::Referrer& referrer, |
396 const std::string& frame_name, | 398 const std::string& frame_name, |
397 WindowOpenDisposition disposition, | 399 WindowOpenDisposition disposition, |
398 const blink::WebWindowFeatures& features, | 400 const blink::WebWindowFeatures& features, |
399 bool user_gesture, | 401 bool user_gesture, |
400 bool opener_suppressed, | 402 bool opener_suppressed, |
401 content::ResourceContext* context, | 403 content::ResourceContext* context, |
402 int render_process_id, | |
403 int opener_render_view_id, | |
404 int opener_render_frame_id, | |
405 bool* no_javascript_access) { | 404 bool* no_javascript_access) { |
406 // We unconditionally allow popup windows at this stage and will give | 405 // We unconditionally allow popup windows at this stage and will give |
407 // the embedder the opporunity to handle displaying of the popup in | 406 // the embedder the opporunity to handle displaying of the popup in |
408 // WebContentsDelegate::AddContents (via the | 407 // WebContentsDelegate::AddContents (via the |
409 // AwContentsClient.onCreateWindow callback). | 408 // AwContentsClient.onCreateWindow callback). |
410 // Note that if the embedder has blocked support for creating popup | 409 // Note that if the embedder has blocked support for creating popup |
411 // windows through AwSettings, then we won't get to this point as | 410 // windows through AwSettings, then we won't get to this point as |
412 // the popup creation will have been blocked at the WebKit level. | 411 // the popup creation will have been blocked at the WebKit level. |
413 if (no_javascript_access) { | 412 if (no_javascript_access) { |
414 *no_javascript_access = false; | 413 *no_javascript_access = false; |
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
552 render_frame_host)); | 551 render_frame_host)); |
553 | 552 |
554 // Although WebView does not support password manager feature, renderer code | 553 // Although WebView does not support password manager feature, renderer code |
555 // could still request this interface, so we register a dummy binder which | 554 // could still request this interface, so we register a dummy binder which |
556 // just drops the incoming request, to avoid the 'Failed to locate a binder | 555 // just drops the incoming request, to avoid the 'Failed to locate a binder |
557 // for interface' error log.. | 556 // for interface' error log.. |
558 registry->AddInterface(base::Bind(&DummyBindPasswordManagerDriver)); | 557 registry->AddInterface(base::Bind(&DummyBindPasswordManagerDriver)); |
559 } | 558 } |
560 | 559 |
561 } // namespace android_webview | 560 } // namespace android_webview |
OLD | NEW |