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

Side by Side Diff: remoting/host/me2me_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/local_input_monitor_unittest.cc ('k') | remoting/host/mouse_clamping_filter.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_ME2ME_DESKTOP_ENVIRONMENT_H_ 5 #ifndef REMOTING_HOST_ME2ME_DESKTOP_ENVIRONMENT_H_
6 #define REMOTING_HOST_ME2ME_DESKTOP_ENVIRONMENT_H_ 6 #define REMOTING_HOST_ME2ME_DESKTOP_ENVIRONMENT_H_
7 7
8 #include "remoting/host/basic_desktop_environment.h" 8 #include "remoting/host/basic_desktop_environment.h"
9 9
10 namespace remoting { 10 namespace remoting {
11 11
12 class CurtainMode; 12 class CurtainMode;
13 class HostWindow; 13 class HostWindow;
14 class LocalInputMonitor; 14 class LocalInputMonitor;
15 15
16 // Same as BasicDesktopEnvironment but supports desktop resizing and X DAMAGE 16 // Same as BasicDesktopEnvironment but supports desktop resizing and X DAMAGE
17 // notifications on Linux. 17 // notifications on Linux.
18 class Me2MeDesktopEnvironment : public BasicDesktopEnvironment { 18 class Me2MeDesktopEnvironment : public BasicDesktopEnvironment {
19 public: 19 public:
20 virtual ~Me2MeDesktopEnvironment(); 20 virtual ~Me2MeDesktopEnvironment();
21 21
22 // DesktopEnvironment interface. 22 // DesktopEnvironment interface.
23 virtual scoped_ptr<ScreenControls> CreateScreenControls() OVERRIDE; 23 virtual scoped_ptr<ScreenControls> CreateScreenControls() override;
24 virtual std::string GetCapabilities() const OVERRIDE; 24 virtual std::string GetCapabilities() const override;
25 virtual scoped_ptr<GnubbyAuthHandler> CreateGnubbyAuthHandler( 25 virtual scoped_ptr<GnubbyAuthHandler> CreateGnubbyAuthHandler(
26 protocol::ClientStub* client_stub) OVERRIDE; 26 protocol::ClientStub* client_stub) override;
27 27
28 protected: 28 protected:
29 friend class Me2MeDesktopEnvironmentFactory; 29 friend class Me2MeDesktopEnvironmentFactory;
30 Me2MeDesktopEnvironment( 30 Me2MeDesktopEnvironment(
31 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, 31 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
32 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, 32 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
33 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner); 33 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner);
34 34
35 // Initializes security features of the desktop environment (the curtain mode 35 // Initializes security features of the desktop environment (the curtain mode
36 // and in-session UI). 36 // and in-session UI).
(...skipping 24 matching lines...) Expand all
61 class Me2MeDesktopEnvironmentFactory : public BasicDesktopEnvironmentFactory { 61 class Me2MeDesktopEnvironmentFactory : public BasicDesktopEnvironmentFactory {
62 public: 62 public:
63 Me2MeDesktopEnvironmentFactory( 63 Me2MeDesktopEnvironmentFactory(
64 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, 64 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
65 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, 65 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
66 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner); 66 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner);
67 virtual ~Me2MeDesktopEnvironmentFactory(); 67 virtual ~Me2MeDesktopEnvironmentFactory();
68 68
69 // DesktopEnvironmentFactory interface. 69 // DesktopEnvironmentFactory interface.
70 virtual scoped_ptr<DesktopEnvironment> Create( 70 virtual scoped_ptr<DesktopEnvironment> Create(
71 base::WeakPtr<ClientSessionControl> client_session_control) OVERRIDE; 71 base::WeakPtr<ClientSessionControl> client_session_control) override;
72 virtual void SetEnableCurtaining(bool enable) OVERRIDE; 72 virtual void SetEnableCurtaining(bool enable) override;
73 virtual void SetEnableGnubbyAuth(bool enable) OVERRIDE; 73 virtual void SetEnableGnubbyAuth(bool enable) override;
74 74
75 protected: 75 protected:
76 bool curtain_enabled() const { return curtain_enabled_; } 76 bool curtain_enabled() const { return curtain_enabled_; }
77 77
78 private: 78 private:
79 // True if curtain mode is enabled. 79 // True if curtain mode is enabled.
80 bool curtain_enabled_; 80 bool curtain_enabled_;
81 81
82 // True if gnubby auth is enabled. 82 // True if gnubby auth is enabled.
83 bool gnubby_auth_enabled_; 83 bool gnubby_auth_enabled_;
84 84
85 DISALLOW_COPY_AND_ASSIGN(Me2MeDesktopEnvironmentFactory); 85 DISALLOW_COPY_AND_ASSIGN(Me2MeDesktopEnvironmentFactory);
86 }; 86 };
87 87
88 } // namespace remoting 88 } // namespace remoting
89 89
90 #endif // REMOTING_HOST_ME2ME_DESKTOP_ENVIRONMENT_H_ 90 #endif // REMOTING_HOST_ME2ME_DESKTOP_ENVIRONMENT_H_
OLDNEW
« no previous file with comments | « remoting/host/local_input_monitor_unittest.cc ('k') | remoting/host/mouse_clamping_filter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698