chrome/browser/ui/tab_helpers.cc - Issue 1091253008: Fix an issue that external protocol in subframes are not handled on Android

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/tab_helpers.cc

Issue 1091253008: Fix an issue that external protocol in subframes are not handled on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: adding isSubFrame to ExternalNavigationParams Created 5 years, 8 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 side-by-side diff with in-line comments

Download patch

« chrome/browser/external_protocol/external_protocol_handler.cc ('K') | « chrome/browser/ui/cocoa/external_protocol_dialog.mm ('k') | chrome/browser/ui/views/external_protocol_dialog.h » ('j') | chrome/browser/ui/views/external_protocol_dialog.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/tab_helpers.cc

diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc

index 921429224f04be121d6b7c48f79a6ea0efa863e9..495f01074f744e324faa8eeadd23e8530b616aad 100644

--- a/chrome/browser/ui/tab_helpers.cc

+++ b/chrome/browser/ui/tab_helpers.cc

@@ -10,6 +10,7 @@

#include "chrome/browser/content_settings/tab_specific_content_settings.h"

#include "chrome/browser/engagement/site_engagement_helper.h"

#include "chrome/browser/engagement/site_engagement_service.h"

+#include "chrome/browser/external_protocol/external_protocol_observer.h"

#include "chrome/browser/favicon/favicon_helper.h"

#include "chrome/browser/history/history_tab_helper.h"

#include "chrome/browser/history/top_sites_factory.h"

@@ -51,7 +52,6 @@

#include "chrome/browser/ui/android/context_menu_helper.h"

#include "chrome/browser/ui/android/window_android_helper.h"

#else

-#include "chrome/browser/external_protocol/external_protocol_observer.h"

#include "chrome/browser/plugins/plugin_observer.h"

#include "chrome/browser/safe_browsing/safe_browsing_tab_observer.h"

#include "chrome/browser/thumbnails/thumbnail_tab_helper.h"

@@ -180,7 +180,6 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {

extensions::ChromeExtensionWebContentsObserver::CreateForWebContents(

web_contents);

extensions::WebNavigationTabObserver::CreateForWebContents(web_contents);

- ExternalProtocolObserver::CreateForWebContents(web_contents);

HungPluginTabHelper::CreateForWebContents(web_contents);

pdf::PDFWebContentsHelper::CreateForWebContentsWithClient(

web_contents,

@@ -196,6 +195,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {

ThumbnailTabHelper::CreateForWebContents(web_contents);

web_modal::WebContentsModalDialogManager::CreateForWebContents(web_contents);

#endif

+ ExternalProtocolObserver::CreateForWebContents(web_contents);

#if defined(OS_WIN)

MetroPinTabHelper::CreateForWebContents(web_contents);