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 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:

View side-by-side diff with in-line comments

Download patch

Index: views/views.gyp

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

index 57e9c0b6661f62e93f739f9bd509214f5aba7d4d..f212cbfad7e5e28823b4a490075dc3f954b90b10 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',

@@ -661,7 +659,7 @@

'sources/': [

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

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

- ],

+ ],

}],

['OS!="mac"', {

'dependencies': [

@@ -793,6 +791,7 @@

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

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

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

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

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

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

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

@@ -854,6 +853,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',

« no previous file with comments | « views/view_unittest.cc ('k') | views/widget/native_widget_views.cc » ('j') | no next file with comments »