diff options
| author | dmaclach@chromium.org <dmaclach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-02 15:31:40 +0000 |
|---|---|---|
| committer | dmaclach@chromium.org <dmaclach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-02 15:31:40 +0000 |
| commit | eccefee0229e222c0130dca22412b4dccfa3f181 (patch) | |
| tree | 959ca4d2d1c15bd29b821a6af45ed1c433779fb1 /remoting/remoting.gyp | |
| parent | 91ef7b0311e0bea576d5b935b2cd378e04c517ca (diff) | |
| download | chromium_src-eccefee0229e222c0130dca22412b4dccfa3f181.zip chromium_src-eccefee0229e222c0130dca22412b4dccfa3f181.tar.gz chromium_src-eccefee0229e222c0130dca22412b4dccfa3f181.tar.bz2 | |
Add support for hotkey to quit chromoting.
BUG=NONE
TEST=Start up chromoting session, try hitting "shift-esc" on host to quit the session.
Review URL: http://codereview.chromium.org/7466041
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95084 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/remoting.gyp')
| -rw-r--r-- | remoting/remoting.gyp | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index 80799a8..88d526e 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -403,7 +403,7 @@ 'host/json_host_config.cc', 'host/json_host_config.h', 'host/local_input_monitor_linux.cc', - 'host/local_input_monitor_mac.cc', + 'host/local_input_monitor_mac.mm', 'host/local_input_monitor_thread_linux.cc', 'host/local_input_monitor_win.cc', 'host/register_support_host_request.cc', @@ -439,6 +439,20 @@ }, }], ['OS=="mac"', { + 'sources': [ + '../third_party/GTM/AppKit/GTMCarbonEvent.h', + '../third_party/GTM/AppKit/GTMCarbonEvent.m', + '../third_party/GTM/DebugUtils/GTMDebugSelectorValidation.h', + '../third_party/GTM/DebugUtils/GTMTypeCasting.h', + '../third_party/GTM/Foundation/GTMObjectSingleton.h', + '../third_party/GTM/GTMDefines.h', + ], + 'include_dirs': [ + '../third_party/GTM', + '../third_party/GTM/AppKit', + '../third_party/GTM/DebugUtils', + '../third_party/GTM/Foundation', + ], 'link_settings': { 'libraries': [ '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework', |