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

Side by Side Diff: remoting/host/it2me_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: 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 2013 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_IT2ME_DESKTOP_ENVIRONMENT_H_
6 #define REMOTING_HOST_ME2ME_DESKTOP_ENVIRONMENT_H_ 6 #define REMOTING_HOST_IT2ME_DESKTOP_ENVIRONMENT_H_
7 7
8 #include "base/memory/scoped_ptr.h"
9 #include "base/memory/weak_ptr.h"
8 #include "remoting/host/basic_desktop_environment.h" 10 #include "remoting/host/basic_desktop_environment.h"
9 11
10 namespace remoting { 12 namespace remoting {
11 13
12 // Same as BasicDesktopEnvironment but supports desktop resizing and X DAMAGE 14 class HostWindow;
13 // notifications on Linux. 15
14 class Me2MeDesktopEnvironment : public BasicDesktopEnvironment { 16 // Same as BasicDesktopEnvironment but also presents the Continue window to
17 // the local user.
18 class It2MeDesktopEnvironment : public BasicDesktopEnvironment {
15 public: 19 public:
16 virtual ~Me2MeDesktopEnvironment(); 20 virtual ~It2MeDesktopEnvironment();
17
18 // DesktopEnvironment interface.
19 virtual scoped_ptr<ScreenControls> CreateScreenControls() OVERRIDE;
20 virtual scoped_ptr<media::ScreenCapturer> CreateVideoCapturer() OVERRIDE;
21 21
22 protected: 22 protected:
23 friend class Me2MeDesktopEnvironmentFactory; 23 friend class It2MeDesktopEnvironmentFactory;
24 Me2MeDesktopEnvironment( 24 It2MeDesktopEnvironment(
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 const UiStrings* ui_strings);
30 30
31 private: 31 private:
32 DISALLOW_COPY_AND_ASSIGN(Me2MeDesktopEnvironment); 32 // Presents the continue window to the local user.
33 scoped_ptr<HostWindow> continue_window_;
34
35 DISALLOW_COPY_AND_ASSIGN(It2MeDesktopEnvironment);
33 }; 36 };
34 37
35 // Used to create |Me2MeDesktopEnvironment| instances. 38 // Used to create |It2MeDesktopEnvironment| instances.
36 class Me2MeDesktopEnvironmentFactory : public BasicDesktopEnvironmentFactory { 39 class It2MeDesktopEnvironmentFactory : public BasicDesktopEnvironmentFactory {
37 public: 40 public:
38 Me2MeDesktopEnvironmentFactory( 41 It2MeDesktopEnvironmentFactory(
39 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, 42 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
40 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, 43 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
41 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner, 44 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner,
42 const UiStrings& ui_strings); 45 const UiStrings& ui_strings);
43 virtual ~Me2MeDesktopEnvironmentFactory(); 46 virtual ~It2MeDesktopEnvironmentFactory();
44 47
45 // DesktopEnvironmentFactory interface. 48 // DesktopEnvironmentFactory interface.
46 virtual scoped_ptr<DesktopEnvironment> Create( 49 virtual scoped_ptr<DesktopEnvironment> Create(
47 base::WeakPtr<ClientSessionControl> client_session_control) OVERRIDE; 50 base::WeakPtr<ClientSessionControl> client_session_control) OVERRIDE;
48 51
49 private: 52 private:
50 DISALLOW_COPY_AND_ASSIGN(Me2MeDesktopEnvironmentFactory); 53 DISALLOW_COPY_AND_ASSIGN(It2MeDesktopEnvironmentFactory);
51 }; 54 };
52 55
53 } // namespace remoting 56 } // namespace remoting
54 57
55 #endif // REMOTING_HOST_ME2ME_DESKTOP_ENVIRONMENT_H_ 58 #endif // REMOTING_HOST_IT2ME_DESKTOP_ENVIRONMENT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698