diff options
| author | dcheng <dcheng@chromium.org> | 2015-04-29 12:36:07 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-29 19:36:37 +0000 |
| commit | a69265d0305aa682fe5a4b04a18d5f19e3e9969e (patch) | |
| tree | 16e3d492b15fc8e60c552c3572039a22031bd322 /remoting | |
| parent | 0be554b77381ec6703d673fb7f688dac97736f07 (diff) | |
| download | chromium_src-a69265d0305aa682fe5a4b04a18d5f19e3e9969e.zip chromium_src-a69265d0305aa682fe5a4b04a18d5f19e3e9969e.tar.gz chromium_src-a69265d0305aa682fe5a4b04a18d5f19e3e9969e.tar.bz2 | |
Apply automated fixits for Chrome clang plugin to remoting.
Working on trimming down plugin warnings on the Windows clang build.
BUG=467287
TBR=jamiewalch@chromium.org
Review URL: https://codereview.chromium.org/1115773002
Cr-Commit-Position: refs/heads/master@{#327548}
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/host/desktop_shape_tracker_win.cc | 6 | ||||
| -rw-r--r-- | remoting/host/local_input_monitor_win.cc | 2 | ||||
| -rw-r--r-- | remoting/host/win/rdp_client_unittest.cc | 2 | ||||
| -rw-r--r-- | remoting/host/win/rdp_client_window.h | 2 | ||||
| -rw-r--r-- | remoting/host/win/rdp_desktop_session.h | 12 |
5 files changed, 13 insertions, 11 deletions
diff --git a/remoting/host/desktop_shape_tracker_win.cc b/remoting/host/desktop_shape_tracker_win.cc index 7072d94..f3a41e9 100644 --- a/remoting/host/desktop_shape_tracker_win.cc +++ b/remoting/host/desktop_shape_tracker_win.cc @@ -27,10 +27,10 @@ struct EnumDesktopShapeData { class DesktopShapeTrackerWin : public DesktopShapeTracker { public: DesktopShapeTrackerWin(); - virtual ~DesktopShapeTrackerWin(); + ~DesktopShapeTrackerWin() override; - virtual void RefreshDesktopShape(); - virtual const webrtc::DesktopRegion& desktop_shape(); + void RefreshDesktopShape() override; + const webrtc::DesktopRegion& desktop_shape() override; private: // Callback passed to EnumWindows() to enumerate windows. diff --git a/remoting/host/local_input_monitor_win.cc b/remoting/host/local_input_monitor_win.cc index 969c5a9..fd5a5f7 100644 --- a/remoting/host/local_input_monitor_win.cc +++ b/remoting/host/local_input_monitor_win.cc @@ -32,7 +32,7 @@ class LocalInputMonitorWin : public base::NonThreadSafe, scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner, base::WeakPtr<ClientSessionControl> client_session_control); - ~LocalInputMonitorWin(); + ~LocalInputMonitorWin() override; private: // The actual implementation resides in LocalInputMonitorWin::Core class. diff --git a/remoting/host/win/rdp_client_unittest.cc b/remoting/host/win/rdp_client_unittest.cc index 2093aeb..3cca8cb 100644 --- a/remoting/host/win/rdp_client_unittest.cc +++ b/remoting/host/win/rdp_client_unittest.cc @@ -57,7 +57,7 @@ static GUID RdpClientModuleLibid = { class RdpClientModule : public ATL::CAtlModuleT<RdpClientModule> { public: RdpClientModule(); - virtual ~RdpClientModule(); + ~RdpClientModule() override; DECLARE_LIBID(RdpClientModuleLibid) diff --git a/remoting/host/win/rdp_client_window.h b/remoting/host/win/rdp_client_window.h index 012dca9..5298228 100644 --- a/remoting/host/win/rdp_client_window.h +++ b/remoting/host/win/rdp_client_window.h @@ -66,7 +66,7 @@ class RdpClientWindow RdpClientWindow(const net::IPEndPoint& server_endpoint, const std::string& terminal_id, EventHandler* event_handler); - ~RdpClientWindow(); + ~RdpClientWindow() override; // Creates the window along with the ActiveX control and initiates the // connection. |screen_size| specifies resolution of the screen. Returns false diff --git a/remoting/host/win/rdp_desktop_session.h b/remoting/host/win/rdp_desktop_session.h index 18a1eb4..052d538 100644 --- a/remoting/host/win/rdp_desktop_session.h +++ b/remoting/host/win/rdp_desktop_session.h @@ -39,11 +39,13 @@ class __declspec(uuid(RDP_DESKTOP_SESSION_CLSID)) RdpDesktopSession RdpDesktopSession(); // IRdpDesktopSession implementation. - STDMETHOD(Connect)(long width, long height, BSTR terminal_id, - IRdpDesktopSessionEventHandler* event_handler); - STDMETHOD(Disconnect)(); - STDMETHOD(ChangeResolution)(long width, long height); - STDMETHOD(InjectSas)(); + STDMETHOD(Connect)(long width, + long height, + BSTR terminal_id, + IRdpDesktopSessionEventHandler* event_handler) override; + STDMETHOD(Disconnect)() override; + STDMETHOD(ChangeResolution)(long width, long height) override; + STDMETHOD(InjectSas)() override; DECLARE_NO_REGISTRY() |