mojo/mojo_examples.gypi - Issue 187183002: Add creation of ServiceManager to Content

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_examples.gypi

Issue 187183002: Add creation of ServiceManager to Content (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merge problem Created 6 years, 9 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_examples.gypi

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

index 79531d8bab5742d8a5ecf2ee6d224d5e0279bc67..2191adf7311697b97117fcc806398e0cb6b0b09b 100644

--- a/mojo/mojo_examples.gypi

+++ b/mojo/mojo_examples.gypi

@@ -12,10 +12,11 @@

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

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

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

+ 'mojo_bindings',

'mojo_environment_standalone',

'mojo_gles2',

'mojo_native_viewport_bindings',

- 'mojo_shell_bindings',

+ 'mojo_shell_client',

'mojo_system',

'mojo_utility',

@@ -63,7 +64,7 @@

'mojo_environment_chromium',

'mojo_gles2',

'mojo_native_viewport_bindings',

- 'mojo_shell_bindings',

+ 'mojo_shell_client',

'mojo_system',

'sources': [

@@ -120,7 +121,7 @@

'mojo_common_lib',

'mojo_environment_chromium',

'mojo_gles2',

- 'mojo_shell_bindings',

+ 'mojo_shell_client',

'mojo_system',

'sources': [

@@ -168,7 +169,7 @@

'mojo_environment_chromium',

'mojo_gles2',

'mojo_launcher_bindings',

- 'mojo_shell_bindings',

+ 'mojo_shell_client',

'mojo_system',

'sources': [

@@ -208,7 +209,7 @@

'mojo_environment_chromium',

'mojo_launcher_bindings',

'mojo_native_viewport_bindings',

- 'mojo_shell_bindings',

+ 'mojo_shell_client',

'mojo_system',

'mojo_view_manager_bindings',

« no previous file with comments | « mojo/mojo.gyp ('k') | mojo/mojo_public.gypi » ('j') | no next file with comments »