views/views.gyp - Issue 8362006: Reland r107720 - Enable the new layer animation framework.

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

Issue 8362006: Reland r107720 - Enable the new layer animation framework. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merge with master. Created 9 years, 2 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: views/views.gyp

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

index 467d196fb54131ab386876d5e7148068cfd2c84b..4370df3a17c4db577fedda56ee14c39c0768189f 100644

--- a/views/views.gyp

+++ b/views/views.gyp

@@ -301,8 +301,6 @@

'ime/text_input_client.h',

'ime/text_input_type_tracker.h',

'ime/text_input_type_tracker.cc',

- 'layer_property_setter.cc',

- 'layer_property_setter.h',

'layout/box_layout.cc',

'layout/box_layout.h',

'layout/fill_layout.cc',

@@ -665,7 +663,7 @@

'sources/': [

['exclude', '../ui/aura/test/test_desktop_delegate.cc'],

['exclude', '../ui/aura/test/test_desktop_delegate.h'],

- ],

+ ],

}],

['OS!="mac"', {

'dependencies': [

@@ -856,6 +854,7 @@

'../ui/ui.gyp:ui',

'../ui/ui.gyp:ui_resources',

'../ui/ui.gyp:ui_resources_standard',

+ '../ui/gfx/compositor/compositor.gyp:compositor',

'views',

'views_desktop_lib',