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

Unified Diff: mojo/mojo.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 | « no previous file | mojo/services/native_viewport/native_viewport_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/mojo.gyp
diff --git a/mojo/mojo.gyp b/mojo/mojo.gyp
index 2f40b1733c4e1cff26cdc9f9cad7acb1507ae68a..1ae37e81a5209e74fc7ad8cc38334cbeb1a9cd05 100644
--- a/mojo/mojo.gyp
+++ b/mojo/mojo.gyp
@@ -291,6 +291,7 @@
'../gpu/gpu.gyp:gles2_implementation',
'../ui/events/events.gyp:events',
'../ui/gfx/gfx.gyp:gfx',
+ '../ui/gl/gl.gyp:gl',
],
'sources': [
'services/native_viewport/android/mojo_viewport.cc',
@@ -299,12 +300,13 @@
'services/native_viewport/native_viewport_android.cc',
'services/native_viewport/native_viewport_controller.cc',
'services/native_viewport/native_viewport_controller.h',
+ 'services/native_viewport/native_viewport_mac.mm',
'services/native_viewport/native_viewport_stub.cc',
'services/native_viewport/native_viewport_win.cc',
'services/native_viewport/native_viewport_x11.cc',
],
'conditions': [
- ['OS=="win" or OS=="android" or OS=="linux"', {
+ ['OS=="win" or OS=="android" or OS=="linux" or OS=="mac"', {
'sources!': [
'services/native_viewport/native_viewport_stub.cc',
],
« no previous file with comments | « no previous file | mojo/services/native_viewport/native_viewport_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698