summaryrefslogtreecommitdiffstats
path: root/remoting/host/desktop_environment.h
diff options
context:
space:
mode:
authorsimonmorris@chromium.org <simonmorris@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-31 20:26:29 +0000
committersimonmorris@chromium.org <simonmorris@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-31 20:26:29 +0000
commit7f44ba4d86341308a888455858426adcc1e713e4 (patch)
tree24d9aab3946f82314ab93fd80dee96f447b1f10c /remoting/host/desktop_environment.h
parentbb5e0001628e91fccba24c07d5767e3faa0c8c43 (diff)
downloadchromium_src-7f44ba4d86341308a888455858426adcc1e713e4.zip
chromium_src-7f44ba4d86341308a888455858426adcc1e713e4.tar.gz
chromium_src-7f44ba4d86341308a888455858426adcc1e713e4.tar.bz2
[Chromoting] Let the Windows IT2Me host send clipboard events to the client.
This CL lets ClipboardWin send clipboard events to ClientSession. BUG=117473 Review URL: https://chromiumcodereview.appspot.com/10413060 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139854 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host/desktop_environment.h')
-rw-r--r--remoting/host/desktop_environment.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/remoting/host/desktop_environment.h b/remoting/host/desktop_environment.h
index f49fcdc..745cf2f 100644
--- a/remoting/host/desktop_environment.h
+++ b/remoting/host/desktop_environment.h
@@ -8,10 +8,7 @@
#include <string>
#include "base/basictypes.h"
-#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
-#include "base/time.h"
-#include "remoting/base/scoped_thread_proxy.h"
#include "remoting/host/event_executor.h"
namespace remoting {
@@ -20,6 +17,7 @@ class Capturer;
class ChromotingHostContext;
namespace protocol {
+class ClipboardStub;
class HostEventStub;
};
@@ -42,7 +40,7 @@ class DesktopEnvironment {
Capturer* capturer() const { return capturer_.get(); }
EventExecutor* event_executor() const { return event_executor_.get(); }
- void OnSessionStarted();
+ void OnSessionStarted(scoped_ptr<protocol::ClipboardStub> client_clipboard);
void OnSessionFinished();
private: