chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.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/ChromeTabCreator.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/ChromeServiceTabLauncher.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/tabmodel/document/TabDelegate.java » ('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/ChromeTabCreator.java

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

index 46668ebaf6e819fc83018ce25db3526a7632de22..c73f31aa0fb2bc0c0c7e3f07a5f2c2d53b08c5b5 100644

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

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

@@ -12,6 +12,7 @@ import org.chromium.base.SysUtils;

import org.chromium.base.TraceEvent;

import org.chromium.chrome.R;

import org.chromium.chrome.browser.ChromeActivity;

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

import org.chromium.chrome.browser.IntentHandler;

import org.chromium.chrome.browser.TabState;

import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager;

@@ -21,7 +22,6 @@ import org.chromium.chrome.browser.tab.TabDelegateFactory;

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

import org.chromium.chrome.browser.util.IntentUtils;

import org.chromium.chrome.browser.util.UrlUtilities;

-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.content_public.common.Referrer;

@@ -162,9 +162,10 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator {

}

tab.getTabRedirectHandler().updateIntent(intent);

- if (intent != null && intent.hasExtra(ServiceTabLauncher.LAUNCH_REQUEST_ID_EXTRA)) {

- ServiceTabLauncher.onWebContentsForRequestAvailable(

- intent.getIntExtra(ServiceTabLauncher.LAUNCH_REQUEST_ID_EXTRA, 0),

+ if (intent != null

+ && intent.hasExtra(ChromeServiceTabLauncher.LAUNCH_REQUEST_ID_EXTRA)) {

+ ChromeServiceTabLauncher.onWebContentsForRequestAvailable(

+ intent.getIntExtra(ChromeServiceTabLauncher.LAUNCH_REQUEST_ID_EXTRA, 0),

tab.getWebContents());

}