summaryrefslogtreecommitdiffstats
path: root/remoting/remoting.gyp
diff options
context:
space:
mode:
authordmaclach@chromium.org <dmaclach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-02 21:53:12 +0000
committerdmaclach@chromium.org <dmaclach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-02 21:53:12 +0000
commit26b627e55c5e9c1bd4d00bb6613fea7a6cb2c463 (patch)
tree4e7ae2b960c69828ec30df00c579b69cc75df7e0 /remoting/remoting.gyp
parent6f4280104722d792dfea82b40ed4d299c39e7786 (diff)
downloadchromium_src-26b627e55c5e9c1bd4d00bb6613fea7a6cb2c463.zip
chromium_src-26b627e55c5e9c1bd4d00bb6613fea7a6cb2c463.tar.gz
chromium_src-26b627e55c5e9c1bd4d00bb6613fea7a6cb2c463.tar.bz2
Fix up mac test client and simple host for remoting.
Remoting's test client and simple host weren't initializing the NSApplication correctly which is required for MessageLoops to work on the Mac. These are just test apps that we use, so I felt it was ok to bring in code from base/test. Also added a check to message_pump_mac.mm to verify that NSApp is initialized before we attempt to use it. BUG=NONE TEST=BUILD Review URL: http://codereview.chromium.org/6461023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76624 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/remoting.gyp')
-rw-r--r--remoting/remoting.gyp4
1 files changed, 4 insertions, 0 deletions
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index 3469923..34f01a1 100644
--- a/remoting/remoting.gyp
+++ b/remoting/remoting.gyp
@@ -304,6 +304,8 @@
'host/capturer_fake_ascii.cc',
'host/capturer_fake_ascii.h',
'host/simple_host_process.cc',
+ '../base/test/mock_chrome_application_mac.mm',
+ '../base/test/mock_chrome_application_mac.h',
],
}, # end of target 'chromoting_simple_host'
@@ -477,6 +479,8 @@
],
'sources': [
'protocol/protocol_test_client.cc',
+ '../base/test/mock_chrome_application_mac.mm',
+ '../base/test/mock_chrome_application_mac.h',
],
}, # end of target 'chromotocol_test_client'