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

Unified Diff: ui/gl/gl.gyp

Issue 56833002: Add a basic NativeViewportMac for Mojo (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address ben's feedback Created 7 years, 1 month 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
« no previous file with comments | « mojo/services/native_viewport/native_viewport_mac.mm ('k') | ui/gl/gl_context_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gl/gl.gyp
diff --git a/ui/gl/gl.gyp b/ui/gl/gl.gyp
index 28cbaa38140991c48ddfcbe923af97fe97f7cfe5..873174627876f9cad5fba5a5f5e9ca48203a158f 100644
--- a/ui/gl/gl.gyp
+++ b/ui/gl/gl.gyp
@@ -256,6 +256,10 @@
'gl_context_cgl.h',
'gl_surface_cgl.cc',
'gl_surface_cgl.h',
+ 'gl_context_nsview.mm',
+ 'gl_context_nsview.h',
+ 'gl_surface_nsview.mm',
+ 'gl_surface_nsview.h',
],
'link_settings': {
'libraries': [
@@ -263,14 +267,6 @@
],
},
}],
- ['OS=="mac" and use_aura == 1', {
- 'sources': [
- 'gl_context_nsview.mm',
- 'gl_context_nsview.h',
- 'gl_surface_nsview.mm',
- 'gl_surface_nsview.h',
- ],
- }],
['OS=="android"', {
'dependencies': [
'gl_jni_headers',
« no previous file with comments | « mojo/services/native_viewport/native_viewport_mac.mm ('k') | ui/gl/gl_context_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698