mojo/mojo_services.gypi - Issue 267293004: Wires up view manager to an actual display

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: mojo/mojo_services.gypi

Issue 267293004: Wires up view manager to an actual display (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: cleanup 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

Index: mojo/mojo_services.gypi

diff --git a/mojo/mojo_services.gypi b/mojo/mojo_services.gypi

index 5b9b95c57c9f64f7ed36554a7bf4e5a453770377..fca41d64d1ef37ebdf8d1f60cf78b5aad2db5e09 100644

--- a/mojo/mojo_services.gypi

+++ b/mojo/mojo_services.gypi

@@ -203,7 +203,10 @@

'../base/base.gyp:base',

'../skia/skia.gyp:skia',

'../ui/aura/aura.gyp:aura',

+ '../ui/base/ui_base.gyp:ui_base',

+ '../ui/gfx/gfx.gyp:gfx',

'../ui/gfx/gfx.gyp:gfx_geometry',

+ 'mojo_aura_support',

'mojo_common_lib',

'mojo_environment_chromium',

'mojo_launcher_bindings',

@@ -215,14 +218,16 @@

'sources': [

'services/view_manager/ids.h',

+ 'services/view_manager/main.cc',

'services/view_manager/node.cc',

'services/view_manager/node.h',

'services/view_manager/node_delegate.h',

'services/view_manager/root_node_manager.cc',

'services/view_manager/root_node_manager.h',

+ 'services/view_manager/root_view_manager.cc',

+ 'services/view_manager/root_view_manager.h',

'services/view_manager/view.cc',

'services/view_manager/view.h',

- 'services/view_manager/view_manager.cc',

'services/view_manager/view_manager_connection.cc',

'services/view_manager/view_manager_connection.h',

'services/view_manager/view_manager_export.h',

@@ -236,10 +241,11 @@

'type': 'executable',

'dependencies': [

'../base/base.gyp:base',

- '../base/base.gyp:run_all_unittests',

+ '../base/base.gyp:test_support_base',

'../skia/skia.gyp:skia',

'../testing/gtest.gyp:gtest',

'../ui/aura/aura.gyp:aura',

+ '../ui/gl/gl.gyp:gl',

'mojo_environment_chromium',

'mojo_shell_client',

'mojo_shell_test_support',

@@ -248,6 +254,9 @@

'mojo_view_manager_common',

'sources': [

+ 'services/view_manager/view_manager_test_suite.cc',

+ 'services/view_manager/view_manager_test_suite.h',

+ 'services/view_manager/view_manager_unittests.cc',

'services/view_manager/view_manager_connection_unittest.cc',

« no previous file with comments | « mojo/mojo_examples.gypi ('k') | mojo/services/native_viewport/native_viewport_service.cc » ('j') | mojo/services/view_manager/main.cc » ('J')