| Index: chrome/browser/chrome_content_browser_client.cc
|
| diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
|
| index 0f10e362afe0843de4712cb9ebfb6635dce46221..00ea83e5e909e5909bfbe67e656588351b5c4414 100644
|
| --- a/chrome/browser/chrome_content_browser_client.cc
|
| +++ b/chrome/browser/chrome_content_browser_client.cc
|
| @@ -156,6 +156,7 @@
|
| #include "chrome/browser/chrome_browser_main_linux.h"
|
| #elif defined(OS_ANDROID)
|
| #include "chrome/browser/android/new_tab_page_url_handler.h"
|
| +#include "chrome/browser/android/service_tab_creator.h"
|
| #include "chrome/browser/android/webapps/single_tab_mode_tab_helper.h"
|
| #include "chrome/browser/chrome_browser_main_android.h"
|
| #include "chrome/common/descriptors_android.h"
|
| @@ -2585,9 +2586,10 @@ bool ChromeContentBrowserClient::CheckMediaAccessPermission(
|
| browser_context, security_origin, type);
|
| }
|
|
|
| -content::WebContents* ChromeContentBrowserClient::OpenURL(
|
| +void ChromeContentBrowserClient::OpenURL(
|
| content::BrowserContext* browser_context,
|
| - const content::OpenURLParams& params) {
|
| + const content::OpenURLParams& params,
|
| + base::Callback<void(content::WebContents*)> callback) {
|
| DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
|
|
| #if !defined(OS_ANDROID) && !defined(OS_IOS)
|
| @@ -2598,12 +2600,16 @@ content::WebContents* ChromeContentBrowserClient::OpenURL(
|
| nav_params.user_gesture = params.user_gesture;
|
|
|
| Navigate(&nav_params);
|
| - return nav_params.target_contents;
|
| + callback.Run(nav_params.target_contents);
|
| +#elif defined(OS_ANDROID)
|
| + ServiceTabCreator::GetInstance()->CreateTab(browser_context,
|
| + params,
|
| + callback);
|
| #else
|
| - // TODO(mlamouri): write a chrome::Navigate() method for Android and iOS.
|
| + // TODO(mlamouri): write a chrome::Navigate() method for iOS.
|
| // See https://crbug.com/448409.
|
| - return nullptr;
|
| -#endif // !defined(OS_ANDROID) && !defined(OS_IOS)
|
| + NOTIMPLEMENTED();
|
| +#endif
|
| }
|
|
|
| content::DevToolsManagerDelegate*
|
|
|