chrome/android/java_sources.gni - 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_sources.gni

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

« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/tabmodel/document/TabDelegate.java ('k') | chrome/browser/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java_sources.gni

diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni

index 97287322e6c04c52fde444c3cb644baeaca47d75..3a8c2a9a68d7de75baf5e53bcf146bbaff8fd144 100644

--- a/chrome/android/java_sources.gni

+++ b/chrome/android/java_sources.gni

@@ -22,7 +22,6 @@ chrome_java_sources = [

"java/src/org/chromium/chrome/browser/ChromeFeatureList.java",

"java/src/org/chromium/chrome/browser/ChromeHttpAuthHandler.java",

"java/src/org/chromium/chrome/browser/ChromeLifetimeController.java",

- "java/src/org/chromium/chrome/browser/ChromeServiceTabLauncher.java",

"java/src/org/chromium/chrome/browser/ChromeStrictMode.java",

"java/src/org/chromium/chrome/browser/ChromeSwitches.java",

"java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java",

@@ -48,6 +47,7 @@ chrome_java_sources = [

"java/src/org/chromium/chrome/browser/PasswordUIView.java",

"java/src/org/chromium/chrome/browser/PowerBroadcastReceiver.java",

"java/src/org/chromium/chrome/browser/RepostFormWarningDialog.java",

+ "java/src/org/chromium/chrome/browser/ServiceTabLauncher.java",

"java/src/org/chromium/chrome/browser/SnackbarActivity.java",

"java/src/org/chromium/chrome/browser/SSLClientCertificateRequest.java",

"java/src/org/chromium/chrome/browser/ShortcutHelper.java",

« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/tabmodel/document/TabDelegate.java ('k') | chrome/browser/BUILD.gn » ('j') | no next file with comments »