ui/gfx/gfx.gyp - Issue 231883003: [stash] 20140404-crbug-312961-mac-views-bridge-C-wholegrid

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

Issue 231883003: [stash] 20140404-crbug-312961-mac-views-bridge-C-wholegrid Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 8 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: ui/gfx/gfx.gyp

diff --git a/ui/gfx/gfx.gyp b/ui/gfx/gfx.gyp

index 4235c391210f5fe4e6d51093b4c60a5d91651481..fed9e4803f57cfdea5aaac80b3695239b601882f 100644

--- a/ui/gfx/gfx.gyp

+++ b/ui/gfx/gfx.gyp

@@ -145,6 +145,8 @@

'color_profile_win.cc',

'color_utils.cc',

'color_utils.h',

+ 'cursor.h',

+ 'cursor_mac.mm',

'display.cc',

'display.h',

'display_observer.cc',

@@ -198,6 +200,8 @@

'interpolated_transform.h',

'linux_font_delegate.cc',

'linux_font_delegate.h',

+ 'mac/point_utils.h',

+ 'mac/point_utils.mm',

'mac/scoped_ns_disable_screen_updates.h',

'native_widget_types.h',

'nine_image_painter.cc',

@@ -390,7 +394,7 @@

}],

- ['use_aura==0', {

+ ['use_aura==0 and OS!="mac"', {

'sources!': [

'nine_image_painter.cc',

'nine_image_painter.h',

« no previous file with comments | « ui/gfx/cursor_mac.mm ('k') | ui/gfx/mac/point_utils.h » ('j') | no next file with comments »