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

Side by Side Diff: remoting/host/basic_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/audio_capturer_win.h ('k') | remoting/host/cast_extension.h » ('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_BASIC_DESKTOP_ENVIRONMENT_H_ 5 #ifndef REMOTING_HOST_BASIC_DESKTOP_ENVIRONMENT_H_
6 #define REMOTING_HOST_BASIC_DESKTOP_ENVIRONMENT_H_ 6 #define REMOTING_HOST_BASIC_DESKTOP_ENVIRONMENT_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 12 matching lines...) Expand all
23 23
24 class GnubbyAuthHandler; 24 class GnubbyAuthHandler;
25 25
26 // Used to create audio/video capturers and event executor that work with 26 // Used to create audio/video capturers and event executor that work with
27 // the local console. 27 // the local console.
28 class BasicDesktopEnvironment : public DesktopEnvironment { 28 class BasicDesktopEnvironment : public DesktopEnvironment {
29 public: 29 public:
30 virtual ~BasicDesktopEnvironment(); 30 virtual ~BasicDesktopEnvironment();
31 31
32 // DesktopEnvironment implementation. 32 // DesktopEnvironment implementation.
33 virtual scoped_ptr<AudioCapturer> CreateAudioCapturer() OVERRIDE; 33 virtual scoped_ptr<AudioCapturer> CreateAudioCapturer() override;
34 virtual scoped_ptr<InputInjector> CreateInputInjector() OVERRIDE; 34 virtual scoped_ptr<InputInjector> CreateInputInjector() override;
35 virtual scoped_ptr<ScreenControls> CreateScreenControls() OVERRIDE; 35 virtual scoped_ptr<ScreenControls> CreateScreenControls() override;
36 virtual scoped_ptr<webrtc::DesktopCapturer> CreateVideoCapturer() OVERRIDE; 36 virtual scoped_ptr<webrtc::DesktopCapturer> CreateVideoCapturer() override;
37 virtual scoped_ptr<webrtc::MouseCursorMonitor> CreateMouseCursorMonitor() 37 virtual scoped_ptr<webrtc::MouseCursorMonitor> CreateMouseCursorMonitor()
38 OVERRIDE; 38 override;
39 virtual std::string GetCapabilities() const OVERRIDE; 39 virtual std::string GetCapabilities() const override;
40 virtual void SetCapabilities(const std::string& capabilities) OVERRIDE; 40 virtual void SetCapabilities(const std::string& capabilities) override;
41 virtual scoped_ptr<GnubbyAuthHandler> CreateGnubbyAuthHandler( 41 virtual scoped_ptr<GnubbyAuthHandler> CreateGnubbyAuthHandler(
42 protocol::ClientStub* client_stub) OVERRIDE; 42 protocol::ClientStub* client_stub) override;
43 43
44 protected: 44 protected:
45 friend class BasicDesktopEnvironmentFactory; 45 friend class BasicDesktopEnvironmentFactory;
46 46
47 BasicDesktopEnvironment( 47 BasicDesktopEnvironment(
48 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, 48 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
49 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, 49 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
50 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner); 50 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner);
51 51
52 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner() const { 52 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner() const {
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 // Used to create |BasicDesktopEnvironment| instances. 89 // Used to create |BasicDesktopEnvironment| instances.
90 class BasicDesktopEnvironmentFactory : public DesktopEnvironmentFactory { 90 class BasicDesktopEnvironmentFactory : public DesktopEnvironmentFactory {
91 public: 91 public:
92 BasicDesktopEnvironmentFactory( 92 BasicDesktopEnvironmentFactory(
93 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, 93 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
94 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, 94 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
95 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner); 95 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner);
96 virtual ~BasicDesktopEnvironmentFactory(); 96 virtual ~BasicDesktopEnvironmentFactory();
97 97
98 // DesktopEnvironmentFactory implementation. 98 // DesktopEnvironmentFactory implementation.
99 virtual bool SupportsAudioCapture() const OVERRIDE; 99 virtual bool SupportsAudioCapture() const override;
100 100
101 protected: 101 protected:
102 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner() const { 102 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner() const {
103 return caller_task_runner_; 103 return caller_task_runner_;
104 } 104 }
105 105
106 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner() const { 106 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner() const {
107 return input_task_runner_; 107 return input_task_runner_;
108 } 108 }
109 109
(...skipping 11 matching lines...) Expand all
121 121
122 // Used to run UI code. 122 // Used to run UI code.
123 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner_; 123 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner_;
124 124
125 DISALLOW_COPY_AND_ASSIGN(BasicDesktopEnvironmentFactory); 125 DISALLOW_COPY_AND_ASSIGN(BasicDesktopEnvironmentFactory);
126 }; 126 };
127 127
128 } // namespace remoting 128 } // namespace remoting
129 129
130 #endif // REMOTING_HOST_BASIC_DESKTOP_ENVIRONMENT_H_ 130 #endif // REMOTING_HOST_BASIC_DESKTOP_ENVIRONMENT_H_
OLDNEW
« no previous file with comments | « remoting/host/audio_capturer_win.h ('k') | remoting/host/cast_extension.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698