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

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

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

Powered by Google App Engine
This is Rietveld 408576698