chrome/android/java/src/org/chromium/chrome/browser/tabmodel/document/TabDelegate.java - 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/android/java/src/org/chromium/chrome/browser/tabmodel/document/TabDelegate.java

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

« chrome/android/java/src/org/chromium/chrome/browser/ChromeServiceTabLauncher.java ('K') | « chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java ('k') | chrome/browser/BUILD.gn » ('j') | chrome/browser/android/chrome_service_tab_launcher.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/tabmodel/document/TabDelegate.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/document/TabDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/document/TabDelegate.java

index 2310f55bfeb12b2db3e7491ee7c2ac18414e6f94..008f6340c9338314d89901be2eca5e4b471d0f8f 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/document/TabDelegate.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/document/TabDelegate.java

@@ -10,6 +10,7 @@ import android.net.Uri;

import org.chromium.base.ApiCompatibilityUtils;

import org.chromium.base.ContextUtils;

+import org.chromium.chrome.browser.ChromeServiceTabLauncher;

import org.chromium.chrome.browser.IntentHandler;

import org.chromium.chrome.browser.TabState;

import org.chromium.chrome.browser.document.ChromeLauncherActivity;

@@ -19,7 +20,6 @@ import org.chromium.chrome.browser.tab.TabIdManager;

import org.chromium.chrome.browser.tabmodel.AsyncTabParamsManager;

import org.chromium.chrome.browser.tabmodel.TabCreatorManager.TabCreator;

import org.chromium.chrome.browser.tabmodel.TabModel.TabLaunchType;

-import org.chromium.components.service_tab_launcher.ServiceTabLauncher;

import org.chromium.content_public.browser.LoadUrlParams;

import org.chromium.content_public.browser.WebContents;

import org.chromium.ui.base.PageTransition;

@@ -133,7 +133,7 @@ public class TabDelegate extends TabCreator {

}

if (asyncParams.getRequestId() != null) {

- intent.putExtra(ServiceTabLauncher.LAUNCH_REQUEST_ID_EXTRA,

+ intent.putExtra(ChromeServiceTabLauncher.LAUNCH_REQUEST_ID_EXTRA,

asyncParams.getRequestId().intValue());

}