diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-13 21:36:27 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-13 21:36:27 +0000 |
| commit | 90c6fd749c7da30b5afa2ac37b59dfd36642a505 (patch) | |
| tree | 0e7c188167ea8b303f7f6be2576737253a28baef /mojo/mojo_examples.gypi | |
| parent | 92c91ea864d007b3d1b56510065b9b773b87a727 (diff) | |
| download | chromium_src-90c6fd749c7da30b5afa2ac37b59dfd36642a505.zip chromium_src-90c6fd749c7da30b5afa2ac37b59dfd36642a505.tar.gz chromium_src-90c6fd749c7da30b5afa2ac37b59dfd36642a505.tar.bz2 | |
Adds a parameter to Launchable that is a ViewTreeNode to render in. Adds an image viewer app that decodes the provided data stream as PNG and renders it in a View associated with the supplied node.
R=aa@chromium.org, sky@chromium.org
http://crbug.com/378151
Review URL: https://codereview.chromium.org/331563003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@277084 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo/mojo_examples.gypi')
| -rw-r--r-- | mojo/mojo_examples.gypi | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/mojo/mojo_examples.gypi b/mojo/mojo_examples.gypi index d7b9888..15c0e5d 100644 --- a/mojo/mojo_examples.gypi +++ b/mojo/mojo_examples.gypi @@ -95,17 +95,39 @@ 'target_name': 'mojo_html_viewer', 'type': 'shared_library', 'dependencies': [ + '../skia/skia.gyp:skia', 'mojo_application', 'mojo_cpp_bindings', - 'mojo_environment_standalone', + 'mojo_environment_chromium', 'mojo_network_bindings', 'mojo_launcher_bindings', - 'mojo_system', + 'mojo_system_impl', 'mojo_utility', + 'mojo_view_manager_lib', ], 'sources': [ 'examples/html_viewer/html_viewer.cc', - 'public/cpp/application/lib/mojo_main_standalone.cc', + 'public/cpp/application/lib/mojo_main_chromium.cc', + ], + }, + { + 'target_name': 'mojo_image_viewer', + 'type': 'shared_library', + 'dependencies': [ + '../skia/skia.gyp:skia', + '../ui/gfx/gfx.gyp:gfx', + 'mojo_application', + 'mojo_cpp_bindings', + 'mojo_environment_chromium', + 'mojo_network_bindings', + 'mojo_launcher_bindings', + 'mojo_system_impl', + 'mojo_utility', + 'mojo_view_manager_lib', + ], + 'sources': [ + 'examples/image_viewer/image_viewer.cc', + 'public/cpp/application/lib/mojo_main_chromium.cc', ], }, { |