Chromium Code Reviews| Index: chrome/browser/external_protocol/external_protocol_handler.cc |
| diff --git a/chrome/browser/external_protocol/external_protocol_handler.cc b/chrome/browser/external_protocol/external_protocol_handler.cc |
| index 2e4dcc1aaa251c9fd1a34d00cc89b0ae108ed734..aa57d8ccb05cde9ba95f68ec7580ca6272993e9e 100644 |
| --- a/chrome/browser/external_protocol/external_protocol_handler.cc |
| +++ b/chrome/browser/external_protocol/external_protocol_handler.cc |
| @@ -5,7 +5,6 @@ |
| #include "chrome/browser/external_protocol/external_protocol_handler.h" |
| #include <stddef.h> |
| - |
|
alexmos
2016/12/12 21:11:40
Did you remove the blank line here by accident?
davidsac (gone - try alexmos)
2016/12/13 23:02:33
Done.
|
| #include <set> |
| #include "base/bind.h" |
| @@ -82,11 +81,13 @@ void LaunchUrlWithoutSecurityCheckWithDelegate( |
| int render_process_host_id, |
| int tab_contents_id, |
| ExternalProtocolHandler::Delegate* delegate) { |
| + content::WebContents* web_contents = |
| + tab_util::GetWebContentsByID(render_process_host_id, tab_contents_id); |
| + |
| if (!delegate) { |
| - ExternalProtocolHandler::LaunchUrlWithoutSecurityCheck( |
| - url, render_process_host_id, tab_contents_id); |
| + ExternalProtocolHandler::LaunchUrlWithoutSecurityCheck(url, web_contents); |
| } else { |
| - delegate->LaunchUrlWithoutSecurityCheck(url); |
| + delegate->LaunchUrlWithoutSecurityCheck(url, web_contents); |
| } |
| } |
| @@ -222,10 +223,7 @@ void ExternalProtocolHandler::LaunchUrlWithDelegate( |
| // static |
| void ExternalProtocolHandler::LaunchUrlWithoutSecurityCheck( |
| const GURL& url, |
| - int render_process_host_id, |
| - int tab_contents_id) { |
| - content::WebContents* web_contents = tab_util::GetWebContentsByID( |
| - render_process_host_id, tab_contents_id); |
| + content::WebContents* web_contents) { |
| if (!web_contents) |
| return; |