Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(267)

Unified Diff: ui/views/views.gyp

Issue 1718043003: MacViews: Clip contents for non-rectangular windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added a comment. Created 4 years, 10 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: ui/views/views.gyp
diff --git a/ui/views/views.gyp b/ui/views/views.gyp
index 584513d222f9add9f2550966bef8180f7e474299..79e63549d886569d8716b1dd75cba2302a09c381 100644
--- a/ui/views/views.gyp
+++ b/ui/views/views.gyp
@@ -788,6 +788,7 @@
}],
['OS=="mac"', {
'dependencies': [
+ '../../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp:google_toolbox_for_mac',
'../accelerated_widget_mac/accelerated_widget_mac.gyp:accelerated_widget_mac',
],
'link_settings': {
@@ -795,6 +796,12 @@
# Required by bridged_native_widget.mm.
'$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework',
],
+ 'conditions': [
+ ['component=="static_library"', {
+ # Needed to link to Obj-C static libraries.
karandeepb 2016/03/04 03:01:56 I am not sure if this needs to be added to a gn fi
tapted 2016/03/04 04:15:01 ldflags += [ "-Wl,-ObjC" ] would probably do it.
+ 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
+ }],
+ ],
},
}],
],
« ui/views/cocoa/bridged_native_widget.mm ('K') | « ui/views/cocoa/bridged_native_widget.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698