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

Side by Side Diff: remoting/host/me2me_desktop_environment.h

Issue 13461029: The continue window is owned by the desktop environment now. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix Mac. Created 7 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 unified diff | Download patch | Annotate | Revision Log
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 struct UiStrings;
13
12 // Same as BasicDesktopEnvironment but supports desktop resizing and X DAMAGE 14 // Same as BasicDesktopEnvironment but supports desktop resizing and X DAMAGE
13 // notifications on Linux. 15 // notifications on Linux.
14 class Me2MeDesktopEnvironment : public BasicDesktopEnvironment { 16 class Me2MeDesktopEnvironment : public BasicDesktopEnvironment {
15 public: 17 public:
16 virtual ~Me2MeDesktopEnvironment(); 18 virtual ~Me2MeDesktopEnvironment();
17 19
18 // DesktopEnvironment interface. 20 // DesktopEnvironment interface.
19 virtual scoped_ptr<ScreenControls> CreateScreenControls() OVERRIDE; 21 virtual scoped_ptr<ScreenControls> CreateScreenControls() OVERRIDE;
20 virtual scoped_ptr<media::ScreenCapturer> CreateVideoCapturer() OVERRIDE; 22 virtual scoped_ptr<media::ScreenCapturer> CreateVideoCapturer() OVERRIDE;
21 23
22 protected: 24 protected:
23 friend class Me2MeDesktopEnvironmentFactory; 25 friend class Me2MeDesktopEnvironmentFactory;
24 Me2MeDesktopEnvironment( 26 Me2MeDesktopEnvironment(
25 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, 27 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
26 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, 28 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
27 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner, 29 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner,
28 base::WeakPtr<ClientSessionControl> client_session_control, 30 base::WeakPtr<ClientSessionControl> client_session_control,
29 const UiStrings* ui_strings); 31 const UiStrings& ui_strings);
30 32
31 private: 33 private:
32 DISALLOW_COPY_AND_ASSIGN(Me2MeDesktopEnvironment); 34 DISALLOW_COPY_AND_ASSIGN(Me2MeDesktopEnvironment);
33 }; 35 };
34 36
35 // Used to create |Me2MeDesktopEnvironment| instances. 37 // Used to create |Me2MeDesktopEnvironment| instances.
36 class Me2MeDesktopEnvironmentFactory : public BasicDesktopEnvironmentFactory { 38 class Me2MeDesktopEnvironmentFactory : public BasicDesktopEnvironmentFactory {
37 public: 39 public:
38 Me2MeDesktopEnvironmentFactory( 40 Me2MeDesktopEnvironmentFactory(
39 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, 41 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
40 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, 42 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
41 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner, 43 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner,
42 const UiStrings& ui_strings); 44 const UiStrings& ui_strings);
43 virtual ~Me2MeDesktopEnvironmentFactory(); 45 virtual ~Me2MeDesktopEnvironmentFactory();
44 46
45 // DesktopEnvironmentFactory interface. 47 // DesktopEnvironmentFactory interface.
46 virtual scoped_ptr<DesktopEnvironment> Create( 48 virtual scoped_ptr<DesktopEnvironment> Create(
47 base::WeakPtr<ClientSessionControl> client_session_control) OVERRIDE; 49 base::WeakPtr<ClientSessionControl> client_session_control) OVERRIDE;
48 50
49 private: 51 private:
50 DISALLOW_COPY_AND_ASSIGN(Me2MeDesktopEnvironmentFactory); 52 DISALLOW_COPY_AND_ASSIGN(Me2MeDesktopEnvironmentFactory);
51 }; 53 };
52 54
53 } // namespace remoting 55 } // namespace remoting
54 56
55 #endif // REMOTING_HOST_ME2ME_DESKTOP_ENVIRONMENT_H_ 57 #endif // REMOTING_HOST_ME2ME_DESKTOP_ENVIRONMENT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698