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

Unified Diff: mojo/mojo.gyp

Issue 267293004: Wires up view manager to an actual display (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 6 years, 7 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
« no previous file with comments | « no previous file | mojo/mojo_examples.gypi » ('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 34322a277d9e6f43475cad7d0f1c4eed6f8301d8..8eea5476c8576cdb1fd01749b9521025f5b71b9a 100644
--- a/mojo/mojo.gyp
+++ b/mojo/mojo.gyp
@@ -504,6 +504,8 @@
'shell/test_child_process.h',
'shell/url_request_context_getter.cc',
'shell/url_request_context_getter.h',
+ 'shell/view_manager_loader.cc',
+ 'shell/view_manager_loader.h',
],
'conditions': [
['OS=="linux"', {
@@ -516,9 +518,15 @@
'dependencies': [
# These are only necessary as long as we hard code use of ViewManager.
'../skia/skia.gyp:skia',
+ 'mojo_gles2',
'mojo_shell_client',
'mojo_view_manager',
],
+ }, { # use_aura==0
+ 'sources!': [
+ 'shell/view_manager_loader.cc',
+ 'shell/view_manager_loader.h',
+ ],
}],
],
},
« no previous file with comments | « no previous file | mojo/mojo_examples.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698