summaryrefslogtreecommitdiffstats
path: root/remoting/host/desktop_environment.h
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-29 20:53:06 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-29 20:53:06 +0000
commit45214d2a1d9e942946a21ae1ff0a1d7b7cc848f1 (patch)
tree0333d94301d42dc4820ef15d5ccaa35bcbef2f73 /remoting/host/desktop_environment.h
parentcff62a0b8d82241c276f7aa733742539329a1160 (diff)
downloadchromium_src-45214d2a1d9e942946a21ae1ff0a1d7b7cc848f1.zip
chromium_src-45214d2a1d9e942946a21ae1ff0a1d7b7cc848f1.tar.gz
chromium_src-45214d2a1d9e942946a21ae1ff0a1d7b7cc848f1.tar.bz2
Replace TaskThreadProxy with non-refcounted ScopedThreadProxy.
BUG=None TEST=Unittests. Review URL: http://codereview.chromium.org/7906020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103343 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host/desktop_environment.h')
-rw-r--r--remoting/host/desktop_environment.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/remoting/host/desktop_environment.h b/remoting/host/desktop_environment.h
index 0fc00c9..e0ed196 100644
--- a/remoting/host/desktop_environment.h
+++ b/remoting/host/desktop_environment.h
@@ -11,6 +11,7 @@
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "base/time.h"
+#include "remoting/base/scoped_thread_proxy.h"
namespace remoting {
@@ -22,7 +23,6 @@ class Curtain;
class DisconnectWindow;
class EventExecutor;
class LocalInputMonitor;
-class UIThreadProxy;
class DesktopEnvironment {
public:
@@ -114,7 +114,7 @@ class DesktopEnvironment {
ContinueTimerState continue_timer_state_;
base::Time continue_timer_target_time_;
- scoped_refptr<UIThreadProxy> proxy_;
+ ScopedThreadProxy ui_thread_proxy_;
DISALLOW_COPY_AND_ASSIGN(DesktopEnvironment);
};