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

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

Issue 9829006: [chromoting] Fix crash when generating access code (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 9 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_DESKTOP_ENVIRONMENT_H_ 5 #ifndef REMOTING_HOST_DESKTOP_ENVIRONMENT_H_
6 #define REMOTING_HOST_DESKTOP_ENVIRONMENT_H_ 6 #define REMOTING_HOST_DESKTOP_ENVIRONMENT_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
11 #include "base/memory/ref_counted.h" 11 #include "base/memory/ref_counted.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "base/time.h" 13 #include "base/time.h"
14 #include "remoting/base/scoped_thread_proxy.h" 14 #include "remoting/base/scoped_thread_proxy.h"
15 15
16 namespace remoting { 16 namespace remoting {
17 17
18 class Capturer; 18 class Capturer;
19 class ChromotingHost; 19 class ChromotingHost;
20 class ChromotingHostContext; 20 class ChromotingHostContext;
21 21
22 namespace protocol { 22 namespace protocol {
23 class HostEventStub; 23 class HostEventStub;
24 }; 24 };
25 25
26 class DesktopEnvironment { 26 class DesktopEnvironment {
27 public: 27 public:
28 static scoped_ptr<DesktopEnvironment> Create(ChromotingHostContext* context); 28 static scoped_ptr<DesktopEnvironment> Create(
alexeypa (please no reviews) 2012/03/21 23:39:12 Add a comment saying that this one creates Desktop
29 ChromotingHostContext* context);
30
31 // Create a DesktopEnvironment used in a service process.
alexeypa (please no reviews) 2012/03/21 23:39:12 nit: Creates ...
Alpha Left Google 2012/03/21 23:43:27 Done.
32 static scoped_ptr<DesktopEnvironment> CreateForService(
33 ChromotingHostContext* context);
29 static scoped_ptr<DesktopEnvironment> CreateFake( 34 static scoped_ptr<DesktopEnvironment> CreateFake(
alexeypa (please no reviews) 2012/03/21 23:39:12 nit: either add an empty line between CreateForSer
Alpha Left Google 2012/03/21 23:43:27 There should be an empty line before comments. Add
30 ChromotingHostContext* context, 35 ChromotingHostContext* context,
31 scoped_ptr<Capturer> capturer, 36 scoped_ptr<Capturer> capturer,
32 scoped_ptr<protocol::HostEventStub> event_executor); 37 scoped_ptr<protocol::HostEventStub> event_executor);
33 38
34 virtual ~DesktopEnvironment(); 39 virtual ~DesktopEnvironment();
35 40
36 void set_host(ChromotingHost* host) { host_ = host; } 41 void set_host(ChromotingHost* host) { host_ = host; }
37 42
38 Capturer* capturer() const { return capturer_.get(); } 43 Capturer* capturer() const { return capturer_.get(); }
39 protocol::HostEventStub* event_executor() const { 44 protocol::HostEventStub* event_executor() const {
(...skipping 17 matching lines...) Expand all
57 62
58 // Executes input and clipboard events received from the client. 63 // Executes input and clipboard events received from the client.
59 scoped_ptr<protocol::HostEventStub> event_executor_; 64 scoped_ptr<protocol::HostEventStub> event_executor_;
60 65
61 DISALLOW_COPY_AND_ASSIGN(DesktopEnvironment); 66 DISALLOW_COPY_AND_ASSIGN(DesktopEnvironment);
62 }; 67 };
63 68
64 } // namespace remoting 69 } // namespace remoting
65 70
66 #endif // REMOTING_HOST_DESKTOP_ENVIRONMENT_H_ 71 #endif // REMOTING_HOST_DESKTOP_ENVIRONMENT_H_
OLDNEW
« no previous file with comments | « no previous file | remoting/host/desktop_environment.cc » ('j') | remoting/host/desktop_environment.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698