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

Side by Side Diff: remoting/host/chromeos/aura_desktop_capturer.h

Issue 866153003: Update {virtual,override,final} to follow C++11 style in remoting, round 2. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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 | « no previous file | remoting/host/chromeos/skia_bitmap_desktop_frame.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 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_CHROMEOS_AURA_DESKTOP_CAPTURER_H_ 5 #ifndef REMOTING_HOST_CHROMEOS_AURA_DESKTOP_CAPTURER_H_
6 #define REMOTING_HOST_CHROMEOS_AURA_DESKTOP_CAPTURER_H_ 6 #define REMOTING_HOST_CHROMEOS_AURA_DESKTOP_CAPTURER_H_
7 7
8 #include "base/memory/weak_ptr.h" 8 #include "base/memory/weak_ptr.h"
9 #include "third_party/webrtc/modules/desktop_capture/screen_capturer.h" 9 #include "third_party/webrtc/modules/desktop_capture/screen_capturer.h"
10 10
11 namespace cc { 11 namespace cc {
12 class CopyOutputResult; 12 class CopyOutputResult;
13 } // namespace cc 13 } // namespace cc
14 14
15 namespace aura { 15 namespace aura {
16 class Window; 16 class Window;
17 } // namespace aura 17 } // namespace aura
18 18
19 namespace remoting { 19 namespace remoting {
20 20
21 // A webrtc::DesktopCapturer that captures pixels from the root window of the 21 // A webrtc::DesktopCapturer that captures pixels from the root window of the
22 // Aura Shell. This is implemented by requesting the layer and its substree to 22 // Aura Shell. This is implemented by requesting the layer and its substree to
23 // be rendered to a given data structure. Start() and Capture() must be called 23 // be rendered to a given data structure. Start() and Capture() must be called
24 // on the Browser UI thread. 24 // on the Browser UI thread.
25 class AuraDesktopCapturer : public webrtc::DesktopCapturer { 25 class AuraDesktopCapturer : public webrtc::DesktopCapturer {
26 public: 26 public:
27 AuraDesktopCapturer(); 27 AuraDesktopCapturer();
28 virtual ~AuraDesktopCapturer(); 28 ~AuraDesktopCapturer() override;
29 29
30 // webrtc::DesktopCapturer implementation. 30 // webrtc::DesktopCapturer implementation.
31 virtual void Start(webrtc::DesktopCapturer::Callback* callback) override; 31 void Start(webrtc::DesktopCapturer::Callback* callback) override;
32 virtual void Capture(const webrtc::DesktopRegion& region) override; 32 void Capture(const webrtc::DesktopRegion& region) override;
33 33
34 private: 34 private:
35 friend class AuraDesktopCapturerTest; 35 friend class AuraDesktopCapturerTest;
36 36
37 // Called when a copy of the layer is captured. 37 // Called when a copy of the layer is captured.
38 void OnFrameCaptured(scoped_ptr<cc::CopyOutputResult> result); 38 void OnFrameCaptured(scoped_ptr<cc::CopyOutputResult> result);
39 39
40 // Points to the callback passed to webrtc::DesktopCapturer::Start(). 40 // Points to the callback passed to webrtc::DesktopCapturer::Start().
41 webrtc::DesktopCapturer::Callback* callback_; 41 webrtc::DesktopCapturer::Callback* callback_;
42 42
43 // The root window of the Aura Shell. 43 // The root window of the Aura Shell.
44 aura::Window* desktop_window_; 44 aura::Window* desktop_window_;
45 45
46 base::WeakPtrFactory<AuraDesktopCapturer> weak_factory_; 46 base::WeakPtrFactory<AuraDesktopCapturer> weak_factory_;
47 47
48 DISALLOW_COPY_AND_ASSIGN(AuraDesktopCapturer); 48 DISALLOW_COPY_AND_ASSIGN(AuraDesktopCapturer);
49 }; 49 };
50 50
51 } // namespace remoting 51 } // namespace remoting
52 52
53 #endif // REMOTING_HOST_CHROMEOS_AURA_DESKTOP_CAPTURER_H_ 53 #endif // REMOTING_HOST_CHROMEOS_AURA_DESKTOP_CAPTURER_H_
OLDNEW
« no previous file with comments | « no previous file | remoting/host/chromeos/skia_bitmap_desktop_frame.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698