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

Unified Diff: remoting/host/host_mock_objects.h

Issue 1101033002: Update {virtual,override} to follow C++11 style in remoting. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/host/host_event_logger_win.cc ('k') | remoting/host/input_injector_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/host_mock_objects.h
diff --git a/remoting/host/host_mock_objects.h b/remoting/host/host_mock_objects.h
index 6ea9d7b1ef72eff1bb2d9d44c8cd97ff15a47330..52d0170d486acbe0033c9cd9a3250117df64568b 100644
--- a/remoting/host/host_mock_objects.h
+++ b/remoting/host/host_mock_objects.h
@@ -30,7 +30,7 @@ namespace remoting {
class MockDesktopEnvironment : public DesktopEnvironment {
public:
MockDesktopEnvironment();
- virtual ~MockDesktopEnvironment();
+ ~MockDesktopEnvironment() override;
MOCK_METHOD0(CreateAudioCapturerPtr, AudioCapturer*());
MOCK_METHOD0(CreateInputInjectorPtr, InputInjector*());
@@ -43,20 +43,20 @@ class MockDesktopEnvironment : public DesktopEnvironment {
protocol::ClientStub* client_stub));
// DesktopEnvironment implementation.
- virtual scoped_ptr<AudioCapturer> CreateAudioCapturer() override;
- virtual scoped_ptr<InputInjector> CreateInputInjector() override;
- virtual scoped_ptr<ScreenControls> CreateScreenControls() override;
- virtual scoped_ptr<webrtc::DesktopCapturer> CreateVideoCapturer() override;
- virtual scoped_ptr<GnubbyAuthHandler> CreateGnubbyAuthHandler(
+ scoped_ptr<AudioCapturer> CreateAudioCapturer() override;
+ scoped_ptr<InputInjector> CreateInputInjector() override;
+ scoped_ptr<ScreenControls> CreateScreenControls() override;
+ scoped_ptr<webrtc::DesktopCapturer> CreateVideoCapturer() override;
+ scoped_ptr<GnubbyAuthHandler> CreateGnubbyAuthHandler(
protocol::ClientStub* client_stub) override;
- virtual scoped_ptr<webrtc::MouseCursorMonitor> CreateMouseCursorMonitor()
+ scoped_ptr<webrtc::MouseCursorMonitor> CreateMouseCursorMonitor()
override;
};
class MockClientSessionControl : public ClientSessionControl {
public:
MockClientSessionControl();
- virtual ~MockClientSessionControl();
+ ~MockClientSessionControl() override;
MOCK_CONST_METHOD0(client_jid, const std::string&());
MOCK_METHOD0(DisconnectSession, void());
@@ -71,7 +71,7 @@ class MockClientSessionControl : public ClientSessionControl {
class MockClientSessionEventHandler : public ClientSession::EventHandler {
public:
MockClientSessionEventHandler();
- virtual ~MockClientSessionEventHandler();
+ ~MockClientSessionEventHandler() override;
MOCK_METHOD1(OnSessionAuthenticating, void(ClientSession* client));
MOCK_METHOD1(OnSessionAuthenticated, bool(ClientSession* client));
@@ -90,12 +90,12 @@ class MockClientSessionEventHandler : public ClientSession::EventHandler {
class MockDesktopEnvironmentFactory : public DesktopEnvironmentFactory {
public:
MockDesktopEnvironmentFactory();
- virtual ~MockDesktopEnvironmentFactory();
+ ~MockDesktopEnvironmentFactory() override;
MOCK_METHOD0(CreatePtr, DesktopEnvironment*());
MOCK_CONST_METHOD0(SupportsAudioCapture, bool());
- virtual scoped_ptr<DesktopEnvironment> Create(
+ scoped_ptr<DesktopEnvironment> Create(
base::WeakPtr<ClientSessionControl> client_session_control) override;
private:
@@ -105,7 +105,7 @@ class MockDesktopEnvironmentFactory : public DesktopEnvironmentFactory {
class MockInputInjector : public InputInjector {
public:
MockInputInjector();
- virtual ~MockInputInjector();
+ ~MockInputInjector() override;
MOCK_METHOD1(InjectClipboardEvent,
void(const protocol::ClipboardEvent& event));
@@ -125,7 +125,7 @@ class MockInputInjector : public InputInjector {
class MockHostStatusObserver : public HostStatusObserver {
public:
MockHostStatusObserver();
- virtual ~MockHostStatusObserver();
+ ~MockHostStatusObserver() override;
MOCK_METHOD1(OnAccessDenied, void(const std::string& jid));
MOCK_METHOD1(OnClientAuthenticated, void(const std::string& jid));
@@ -142,7 +142,7 @@ class MockHostStatusObserver : public HostStatusObserver {
class MockGnubbyAuthHandler : public GnubbyAuthHandler {
public:
MockGnubbyAuthHandler();
- virtual ~MockGnubbyAuthHandler();
+ ~MockGnubbyAuthHandler() override;
MOCK_METHOD1(DeliverClientMessage, void(const std::string& message));
MOCK_CONST_METHOD2(DeliverHostDataMessage,
@@ -155,7 +155,7 @@ class MockGnubbyAuthHandler : public GnubbyAuthHandler {
class MockMouseCursorMonitor : public webrtc::MouseCursorMonitor {
public:
MockMouseCursorMonitor();
- virtual ~MockMouseCursorMonitor();
+ ~MockMouseCursorMonitor() override;
MOCK_METHOD2(Init, void(Callback* callback, Mode mode));
MOCK_METHOD0(Capture, void());
« no previous file with comments | « remoting/host/host_event_logger_win.cc ('k') | remoting/host/input_injector_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698