components/components.gyp - 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: components/components.gyp

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: components/components.gyp

diff --git a/components/components.gyp b/components/components.gyp

index bbf57795ca7a487b5eafff926906332cbd2c5ef4..ccbf920cf6d02fd3f1a9163c11e502362b143ee4 100644

--- a/components/components.gyp

+++ b/components/components.gyp

@@ -110,7 +110,6 @@

['OS == "android"', {

'includes': [

'external_video_surface.gypi',

- 'service_tab_launcher.gypi',

}],

['OS != "ios"', {

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