remoting/remoting.gyp - Issue 9953002: The me2me host is now configurable from the web UI on Windows.

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: remoting/remoting.gyp

Issue 9953002: The me2me host is now configurable from the web UI on Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Addressed one or two nits. :-) Created 8 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:

Index: remoting/remoting.gyp

diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp

index 77ce3fe66b92f49f9352588af0c6468019425176..379a4ab8fcbae0ea37b2cdfad7919c9781bb4999 100644

--- a/remoting/remoting.gyp

+++ b/remoting/remoting.gyp

@@ -238,9 +238,12 @@

'<(INTERMEDIATE_DIR)',

'dependencies': [

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

'remoting_version_resources',

'sources': [

+ 'host/branding.cc',

+ 'host/branding.h',

'host/elevated_controller.idl',

'host/elevated_controller.rc',

'host/elevated_controller_module_win.cc',

@@ -515,6 +518,8 @@

'../third_party/npapi/npapi.gyp:npapi',

'sources': [

+ 'host/branding.cc',

+ 'host/branding.h',

'host/it2me_host_user_interface.cc',

'host/it2me_host_user_interface.h',

'host/plugin/daemon_controller.h',

@@ -569,7 +574,11 @@

'../ipc/ipc.gyp:ipc',

'remoting_version_resources',

+ 'include_dirs': [

+ '<(INTERMEDIATE_DIR)',

+ ],

'sources': [

+ 'host/elevated_controller.idl',

'host/plugin/host_plugin.def',

'host/plugin/host_plugin.rc',

'<(SHARED_INTERMEDIATE_DIR)/remoting_version/host_plugin_version.rc'

« no previous file with comments | « remoting/host/plugin/daemon_controller_win.cc ('k') | remoting/webapp/daemon_plugin.js » ('j') | no next file with comments »