chrome/browser/chrome_content_browser_client.cc - Issue 2119273002: Merge ChromeServiceTabLauncher and ServiceTabLauncher

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/chrome_content_browser_client.cc

Issue 2119273002: Merge ChromeServiceTabLauncher and ServiceTabLauncher (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Merge branch 'master' into chrome_service_tab_launcher Created 4 years, 5 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

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 aa41274e9d4c3d901dd114a784aeff9a82c383c4..4644c9d0d96c5f0bd96cd4913e032d41fcd176b8 100644

--- a/chrome/browser/chrome_content_browser_client.cc

+++ b/chrome/browser/chrome_content_browser_client.cc

@@ -229,8 +229,8 @@

#if BUILDFLAG(ANDROID_JAVA_UI)

#include "chrome/browser/android/mojo/chrome_service_registrar_android.h"

#include "chrome/browser/android/ntp/new_tab_page_url_handler.h"

+#include "chrome/browser/android/service_tab_launcher.h"

#include "chrome/browser/android/webapps/single_tab_mode_tab_helper.h"

-#include "components/service_tab_launcher/browser/android/service_tab_launcher.h"

#endif

#if defined(OS_ANDROID)

@@ -2871,8 +2871,8 @@ void ChromeContentBrowserClient::OpenURL(

DCHECK_CURRENTLY_ON(BrowserThread::UI);

#if BUILDFLAG(ANDROID_JAVA_UI)

- service_tab_launcher::ServiceTabLauncher::GetInstance()->LaunchTab(

- browser_context, params, callback);

+ ServiceTabLauncher::GetInstance()->LaunchTab(browser_context, params,

+ callback);

#else

chrome::NavigateParams nav_params(

Profile::FromBrowserContext(browser_context),

« no previous file with comments | « chrome/browser/android/service_tab_launcher.cc ('k') | chrome/chrome.gyp » ('j') | no next file with comments »