diff options
| author | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-02 21:26:39 +0000 |
|---|---|---|
| committer | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-02 21:26:39 +0000 |
| commit | b592165f7de822d7bcaa3812ec11a4c4125d845a (patch) | |
| tree | 20cf34d01683fbae5d0df04fedd1aed5bd9e8eb5 /remoting/remoting.gyp | |
| parent | 3764dddb64111f17e929e76de2835a63088593b8 (diff) | |
| download | chromium_src-b592165f7de822d7bcaa3812ec11a4c4125d845a.zip chromium_src-b592165f7de822d7bcaa3812ec11a4c4125d845a.tar.gz chromium_src-b592165f7de822d7bcaa3812ec11a4c4125d845a.tar.bz2 | |
Fix ChromotingHost and DesktopEnvironmentFactory references to TaskRunners.
These classes previously referenced TaskRunners indirectly via a supplied
ChromotingHostContext, causing them to fail unexpectedly when trying to use the
TaskRunners after they had been detached from the ChromotingHostContext during
shutdown. This CL has them take their own references to the TaskRunners they
need.
This CL also renames the "desktop" TaskRunner to "input" TaskRunner, reflecting
its current purpose.
BUG=145856
Review URL: https://chromiumcodereview.appspot.com/11018004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@159771 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/remoting.gyp')
| -rw-r--r-- | remoting/remoting.gyp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index e9d43d9..4afd758 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -1347,6 +1347,8 @@ 'host/dns_blackhole_checker.cc', 'host/dns_blackhole_checker.h', 'host/event_executor.h', + 'host/event_executor_fake.cc', + 'host/event_executor_fake.h', 'host/event_executor_linux.cc', 'host/event_executor_mac.cc', 'host/event_executor_win.cc', @@ -1892,8 +1894,6 @@ 'host/client_session_unittest.cc', 'host/differ_block_unittest.cc', 'host/differ_unittest.cc', - 'host/event_executor_fake.cc', - 'host/event_executor_fake.h', 'host/heartbeat_sender_unittest.cc', 'host/host_key_pair_unittest.cc', 'host/host_mock_objects.cc', |