trunk/src/ui/views/views.gyp - Issue 18547009: Revert 209420 "Factor out content shell and tests into a standal..."

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: trunk/src/ui/views/views.gyp

Issue 18547009: Revert 209420 "Factor out content shell and tests into a standal..." (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 7 years, 6 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:

Index: trunk/src/ui/views/views.gyp

===================================================================

--- trunk/src/ui/views/views.gyp (revision 209769)

+++ trunk/src/ui/views/views.gyp (working copy)

@@ -632,7 +632,7 @@

'dependencies': [

'../../base/base.gyp:base',

'../../content/content.gyp:content',

- '../../content/content_shell_and_tests.gyp:test_support_content',

+ '../../content/content.gyp:test_support_content',

'../../ipc/ipc.gyp:test_support_ipc',

'../../skia/skia.gyp:skia',

'../../testing/gtest.gyp:gtest',

@@ -973,9 +973,9 @@

'../../base/base.gyp:base',

'../../base/base.gyp:base_i18n',

'../../chrome/chrome_resources.gyp:packed_resources',

+ '../../content/content.gyp:content_shell_lib',

'../../content/content.gyp:content',

- '../../content/content_shell_and_tests.gyp:test_support_content',

- '../../content/content_shell_and_tests.gyp:content_shell_lib',

+ '../../content/content.gyp:test_support_content',

'../../skia/skia.gyp:skia',

'../../third_party/icu/icu.gyp:icui18n',

'../../third_party/icu/icu.gyp:icuuc',

Property changes on: trunk\src\ui\views\views.gyp

___________________________________________________________________

Added: svn:mergeinfo

« no previous file with comments | « trunk/src/content/content_tests.gypi ('k') | no next file » | no next file with comments »