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

Side by Side Diff: remoting/host/shaped_desktop_capturer.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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_SHAPED_DESKTOP_CAPTURER_H_ 5 #ifndef REMOTING_HOST_SHAPED_DESKTOP_CAPTURER_H_
6 #define REMOTING_HOST_SHAPED_DESKTOP_CAPTURER_H_ 6 #define REMOTING_HOST_SHAPED_DESKTOP_CAPTURER_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "third_party/webrtc/modules/desktop_capture/desktop_capturer.h" 9 #include "third_party/webrtc/modules/desktop_capture/desktop_capturer.h"
10 10
11 namespace remoting { 11 namespace remoting {
12 12
13 class DesktopShapeTracker; 13 class DesktopShapeTracker;
14 14
15 // Screen capturer that also captures desktop shape. 15 // Screen capturer that also captures desktop shape.
16 class ShapedDesktopCapturer : public webrtc::DesktopCapturer, 16 class ShapedDesktopCapturer : public webrtc::DesktopCapturer,
17 public webrtc::DesktopCapturer::Callback { 17 public webrtc::DesktopCapturer::Callback {
18 public: 18 public:
19 ShapedDesktopCapturer(scoped_ptr<webrtc::DesktopCapturer> screen_capturer, 19 ShapedDesktopCapturer(scoped_ptr<webrtc::DesktopCapturer> screen_capturer,
20 scoped_ptr<DesktopShapeTracker> shape_tracker); 20 scoped_ptr<DesktopShapeTracker> shape_tracker);
21 virtual ~ShapedDesktopCapturer(); 21 virtual ~ShapedDesktopCapturer();
22 22
23 // webrtc::DesktopCapturer interface. 23 // webrtc::DesktopCapturer interface.
24 virtual void Start(webrtc::DesktopCapturer::Callback* callback) OVERRIDE; 24 virtual void Start(webrtc::DesktopCapturer::Callback* callback) override;
25 virtual void Capture(const webrtc::DesktopRegion& region) OVERRIDE; 25 virtual void Capture(const webrtc::DesktopRegion& region) override;
26 26
27 private: 27 private:
28 // webrtc::DesktopCapturer::Callback interface. 28 // webrtc::DesktopCapturer::Callback interface.
29 virtual webrtc::SharedMemory* CreateSharedMemory(size_t size) OVERRIDE; 29 virtual webrtc::SharedMemory* CreateSharedMemory(size_t size) override;
30 virtual void OnCaptureCompleted(webrtc::DesktopFrame* frame) OVERRIDE; 30 virtual void OnCaptureCompleted(webrtc::DesktopFrame* frame) override;
31 31
32 scoped_ptr<webrtc::DesktopCapturer> desktop_capturer_; 32 scoped_ptr<webrtc::DesktopCapturer> desktop_capturer_;
33 scoped_ptr<DesktopShapeTracker> shape_tracker_; 33 scoped_ptr<DesktopShapeTracker> shape_tracker_;
34 webrtc::DesktopCapturer::Callback* callback_; 34 webrtc::DesktopCapturer::Callback* callback_;
35 35
36 DISALLOW_COPY_AND_ASSIGN(ShapedDesktopCapturer); 36 DISALLOW_COPY_AND_ASSIGN(ShapedDesktopCapturer);
37 }; 37 };
38 38
39 } // namespace remoting 39 } // namespace remoting
40 40
41 #endif // REMOTING_HOST_SHAPED_DESKTOP_CAPTURER_H_ 41 #endif // REMOTING_HOST_SHAPED_DESKTOP_CAPTURER_H_
OLDNEW
« no previous file with comments | « remoting/host/setup/service_client.cc ('k') | remoting/host/shaped_desktop_capturer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698