chrome/chrome_browser.gypi - 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/chrome_browser.gypi

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/chrome_browser.gypi

diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi

index 5112ba93d06f91acabd9b85044b6e3a53f0c097d..314b1a22e596f8987c4ee7459b24f15e23079e38 100644

--- a/chrome/chrome_browser.gypi

+++ b/chrome/chrome_browser.gypi

@@ -942,6 +942,8 @@

'browser/android/safe_browsing/safe_browsing_api_handler_bridge.h',

'browser/android/seccomp_support_detector.cc',

'browser/android/seccomp_support_detector.h',

+ 'browser/android/service_tab_launcher.cc',

+ 'browser/android/service_tab_launcher.h',

'browser/android/sessions/session_tab_helper_android.cc',

'browser/android/sessions/session_tab_helper_android.h',

'browser/android/shortcut_helper.cc',

@@ -2041,6 +2043,7 @@

'android/java/src/org/chromium/chrome/browser/SSLClientCertificateRequest.java',

'android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java',

'android/java/src/org/chromium/chrome/browser/sessions/SessionTabHelper.java',

+ 'android/java/src/org/chromium/chrome/browser/ServiceTabLauncher.java',

'android/java/src/org/chromium/chrome/browser/signin/AccountManagementScreenHelper.java',

'android/java/src/org/chromium/chrome/browser/signin/AccountTrackerService.java',

'android/java/src/org/chromium/chrome/browser/signin/OAuth2TokenService.java',

@@ -3838,7 +3841,6 @@

'../components/components.gyp:precache_content',

'../components/components.gyp:precache_core',

'../components/components.gyp:security_state',

- '../components/components.gyp:service_tab_launcher',

'../components/components.gyp:toolbar',

'../components/components.gyp:web_contents_delegate_android',

'chrome_browser_jni_headers',

« no previous file with comments | « chrome/chrome.gyp ('k') | components/components.gyp » ('j') | no next file with comments »