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

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

Issue 628753002: replace OVERRIDE and FINAL with override and final in remoting/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 years, 2 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
« no previous file with comments | « remoting/host/ipc_audio_capturer.h ('k') | remoting/host/ipc_desktop_environment_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner, 42 scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner,
43 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, 43 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
44 scoped_refptr<base::SingleThreadTaskRunner> capture_task_runner, 44 scoped_refptr<base::SingleThreadTaskRunner> capture_task_runner,
45 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner, 45 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner,
46 base::WeakPtr<ClientSessionControl> client_session_control, 46 base::WeakPtr<ClientSessionControl> client_session_control,
47 base::WeakPtr<DesktopSessionConnector> desktop_session_connector, 47 base::WeakPtr<DesktopSessionConnector> desktop_session_connector,
48 bool virtual_terminal); 48 bool virtual_terminal);
49 virtual ~IpcDesktopEnvironment(); 49 virtual ~IpcDesktopEnvironment();
50 50
51 // DesktopEnvironment implementation. 51 // DesktopEnvironment implementation.
52 virtual scoped_ptr<AudioCapturer> CreateAudioCapturer() OVERRIDE; 52 virtual scoped_ptr<AudioCapturer> CreateAudioCapturer() override;
53 virtual scoped_ptr<InputInjector> CreateInputInjector() OVERRIDE; 53 virtual scoped_ptr<InputInjector> CreateInputInjector() override;
54 virtual scoped_ptr<ScreenControls> CreateScreenControls() OVERRIDE; 54 virtual scoped_ptr<ScreenControls> CreateScreenControls() override;
55 virtual scoped_ptr<webrtc::DesktopCapturer> CreateVideoCapturer() OVERRIDE; 55 virtual scoped_ptr<webrtc::DesktopCapturer> CreateVideoCapturer() override;
56 virtual scoped_ptr<webrtc::MouseCursorMonitor> CreateMouseCursorMonitor() 56 virtual scoped_ptr<webrtc::MouseCursorMonitor> CreateMouseCursorMonitor()
57 OVERRIDE; 57 override;
58 virtual std::string GetCapabilities() const OVERRIDE; 58 virtual std::string GetCapabilities() const override;
59 virtual void SetCapabilities(const std::string& capabilities) OVERRIDE; 59 virtual void SetCapabilities(const std::string& capabilities) override;
60 virtual scoped_ptr<GnubbyAuthHandler> CreateGnubbyAuthHandler( 60 virtual scoped_ptr<GnubbyAuthHandler> CreateGnubbyAuthHandler(
61 protocol::ClientStub* client_stub) OVERRIDE; 61 protocol::ClientStub* client_stub) override;
62 62
63 private: 63 private:
64 scoped_refptr<DesktopSessionProxy> desktop_session_proxy_; 64 scoped_refptr<DesktopSessionProxy> desktop_session_proxy_;
65 65
66 DISALLOW_COPY_AND_ASSIGN(IpcDesktopEnvironment); 66 DISALLOW_COPY_AND_ASSIGN(IpcDesktopEnvironment);
67 }; 67 };
68 68
69 // Used to create IpcDesktopEnvironment objects integrating with the desktop via 69 // Used to create IpcDesktopEnvironment objects integrating with the desktop via
70 // a helper process and talking to that process via IPC. 70 // a helper process and talking to that process via IPC.
71 class IpcDesktopEnvironmentFactory 71 class IpcDesktopEnvironmentFactory
72 : public DesktopEnvironmentFactory, 72 : public DesktopEnvironmentFactory,
73 public DesktopSessionConnector { 73 public DesktopSessionConnector {
74 public: 74 public:
75 // Passes a reference to the IPC channel connected to the daemon process and 75 // Passes a reference to the IPC channel connected to the daemon process and
76 // relevant task runners. |daemon_channel| must outlive this object. 76 // relevant task runners. |daemon_channel| must outlive this object.
77 IpcDesktopEnvironmentFactory( 77 IpcDesktopEnvironmentFactory(
78 scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner, 78 scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner,
79 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, 79 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
80 scoped_refptr<base::SingleThreadTaskRunner> capture_task_runner, 80 scoped_refptr<base::SingleThreadTaskRunner> capture_task_runner,
81 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner, 81 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner,
82 IPC::Sender* daemon_channel); 82 IPC::Sender* daemon_channel);
83 virtual ~IpcDesktopEnvironmentFactory(); 83 virtual ~IpcDesktopEnvironmentFactory();
84 84
85 // DesktopEnvironmentFactory implementation. 85 // DesktopEnvironmentFactory implementation.
86 virtual scoped_ptr<DesktopEnvironment> Create( 86 virtual scoped_ptr<DesktopEnvironment> Create(
87 base::WeakPtr<ClientSessionControl> client_session_control) OVERRIDE; 87 base::WeakPtr<ClientSessionControl> client_session_control) override;
88 virtual void SetEnableCurtaining(bool enable) OVERRIDE; 88 virtual void SetEnableCurtaining(bool enable) override;
89 virtual bool SupportsAudioCapture() const OVERRIDE; 89 virtual bool SupportsAudioCapture() const override;
90 90
91 // DesktopSessionConnector implementation. 91 // DesktopSessionConnector implementation.
92 virtual void ConnectTerminal( 92 virtual void ConnectTerminal(
93 DesktopSessionProxy* desktop_session_proxy, 93 DesktopSessionProxy* desktop_session_proxy,
94 const ScreenResolution& resolution, 94 const ScreenResolution& resolution,
95 bool virtual_terminal) OVERRIDE; 95 bool virtual_terminal) override;
96 virtual void DisconnectTerminal( 96 virtual void DisconnectTerminal(
97 DesktopSessionProxy* desktop_session_proxy) OVERRIDE; 97 DesktopSessionProxy* desktop_session_proxy) override;
98 virtual void SetScreenResolution( 98 virtual void SetScreenResolution(
99 DesktopSessionProxy* desktop_session_proxy, 99 DesktopSessionProxy* desktop_session_proxy,
100 const ScreenResolution& resolution) OVERRIDE; 100 const ScreenResolution& resolution) override;
101 virtual void OnDesktopSessionAgentAttached( 101 virtual void OnDesktopSessionAgentAttached(
102 int terminal_id, 102 int terminal_id,
103 base::ProcessHandle desktop_process, 103 base::ProcessHandle desktop_process,
104 IPC::PlatformFileForTransit desktop_pipe) OVERRIDE; 104 IPC::PlatformFileForTransit desktop_pipe) override;
105 virtual void OnTerminalDisconnected(int terminal_id) OVERRIDE; 105 virtual void OnTerminalDisconnected(int terminal_id) override;
106 106
107 private: 107 private:
108 // Used to run the audio capturer. 108 // Used to run the audio capturer.
109 scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner_; 109 scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner_;
110 110
111 // Task runner on which methods of DesktopEnvironmentFactory interface should 111 // Task runner on which methods of DesktopEnvironmentFactory interface should
112 // be called. 112 // be called.
113 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner_; 113 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner_;
114 114
115 // Used to run the video capturer. 115 // Used to run the video capturer.
(...skipping 19 matching lines...) Expand all
135 135
136 // Factory for weak pointers to DesktopSessionConnector interface. 136 // Factory for weak pointers to DesktopSessionConnector interface.
137 base::WeakPtrFactory<DesktopSessionConnector> connector_factory_; 137 base::WeakPtrFactory<DesktopSessionConnector> connector_factory_;
138 138
139 DISALLOW_COPY_AND_ASSIGN(IpcDesktopEnvironmentFactory); 139 DISALLOW_COPY_AND_ASSIGN(IpcDesktopEnvironmentFactory);
140 }; 140 };
141 141
142 } // namespace remoting 142 } // namespace remoting
143 143
144 #endif // REMOTING_HOST_IPC_DESKTOP_ENVIRONMENT_H_ 144 #endif // REMOTING_HOST_IPC_DESKTOP_ENVIRONMENT_H_
OLDNEW
« no previous file with comments | « remoting/host/ipc_audio_capturer.h ('k') | remoting/host/ipc_desktop_environment_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698