Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(538)

Side by Side Diff: trunk/src/remoting/host/ipc_desktop_environment.h

Issue 151163002: Revert 248045 "Use webrtc::MouseCursorMonitor for cursor shapes" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef REMOTING_HOST_IPC_DESKTOP_ENVIRONMENT_H_ 5 #ifndef REMOTING_HOST_IPC_DESKTOP_ENVIRONMENT_H_
6 #define REMOTING_HOST_IPC_DESKTOP_ENVIRONMENT_H_ 6 #define REMOTING_HOST_IPC_DESKTOP_ENVIRONMENT_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 10
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 base::WeakPtr<ClientSessionControl> client_session_control, 45 base::WeakPtr<ClientSessionControl> client_session_control,
46 base::WeakPtr<DesktopSessionConnector> desktop_session_connector, 46 base::WeakPtr<DesktopSessionConnector> desktop_session_connector,
47 bool virtual_terminal); 47 bool virtual_terminal);
48 virtual ~IpcDesktopEnvironment(); 48 virtual ~IpcDesktopEnvironment();
49 49
50 // DesktopEnvironment implementation. 50 // DesktopEnvironment implementation.
51 virtual scoped_ptr<AudioCapturer> CreateAudioCapturer() OVERRIDE; 51 virtual scoped_ptr<AudioCapturer> CreateAudioCapturer() OVERRIDE;
52 virtual scoped_ptr<InputInjector> CreateInputInjector() OVERRIDE; 52 virtual scoped_ptr<InputInjector> CreateInputInjector() OVERRIDE;
53 virtual scoped_ptr<ScreenControls> CreateScreenControls() OVERRIDE; 53 virtual scoped_ptr<ScreenControls> CreateScreenControls() OVERRIDE;
54 virtual scoped_ptr<webrtc::ScreenCapturer> CreateVideoCapturer() OVERRIDE; 54 virtual scoped_ptr<webrtc::ScreenCapturer> CreateVideoCapturer() OVERRIDE;
55 virtual scoped_ptr<webrtc::MouseCursorMonitor> CreateMouseCursorMonitor()
56 OVERRIDE;
57 virtual std::string GetCapabilities() const OVERRIDE; 55 virtual std::string GetCapabilities() const OVERRIDE;
58 virtual void SetCapabilities(const std::string& capabilities) OVERRIDE; 56 virtual void SetCapabilities(const std::string& capabilities) OVERRIDE;
59 57
60 private: 58 private:
61 scoped_refptr<DesktopSessionProxy> desktop_session_proxy_; 59 scoped_refptr<DesktopSessionProxy> desktop_session_proxy_;
62 60
63 DISALLOW_COPY_AND_ASSIGN(IpcDesktopEnvironment); 61 DISALLOW_COPY_AND_ASSIGN(IpcDesktopEnvironment);
64 }; 62 };
65 63
66 // Used to create IpcDesktopEnvironment objects integrating with the desktop via 64 // Used to create IpcDesktopEnvironment objects integrating with the desktop via
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 // This gives us more than 67 years of unique IDs assuming a new ID is 130 // This gives us more than 67 years of unique IDs assuming a new ID is
133 // allocated every second. 131 // allocated every second.
134 int next_id_; 132 int next_id_;
135 133
136 DISALLOW_COPY_AND_ASSIGN(IpcDesktopEnvironmentFactory); 134 DISALLOW_COPY_AND_ASSIGN(IpcDesktopEnvironmentFactory);
137 }; 135 };
138 136
139 } // namespace remoting 137 } // namespace remoting
140 138
141 #endif // REMOTING_HOST_IPC_DESKTOP_ENVIRONMENT_H_ 139 #endif // REMOTING_HOST_IPC_DESKTOP_ENVIRONMENT_H_
OLDNEW
« no previous file with comments | « trunk/src/remoting/host/host_mock_objects.cc ('k') | trunk/src/remoting/host/ipc_desktop_environment.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698