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

Side by Side Diff: remoting/client/chromoting_client.h

Issue 3161034: Rename (Host|Client)Message to Chromoting(Host|Client)Message. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Fix merge conflicts Created 10 years, 4 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/base/protocol_decoder_unittest.cc ('k') | remoting/client/chromoting_client.cc » ('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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 // ChromotingClient is the controller for the Client implementation. 5 // ChromotingClient is the controller for the Client implementation.
6 6
7 #ifndef REMOTING_CLIENT_CHROMOTING_CLIENT_H 7 #ifndef REMOTING_CLIENT_CHROMOTING_CLIENT_H
8 #define REMOTING_CLIENT_CHROMOTING_CLIENT_H 8 #define REMOTING_CLIENT_CHROMOTING_CLIENT_H
9 9
10 #include "base/task.h" 10 #include "base/task.h"
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 DISCONNECTED, 58 DISCONNECTED,
59 FAILED, 59 FAILED,
60 }; 60 };
61 61
62 MessageLoop* message_loop(); 62 MessageLoop* message_loop();
63 63
64 // Convenience method for modifying the state on this object's message loop. 64 // Convenience method for modifying the state on this object's message loop.
65 void SetState(State s); 65 void SetState(State s);
66 66
67 // Handles for chromotocol messages. 67 // Handles for chromotocol messages.
68 void InitClient(HostMessage* msg); 68 void InitClient(ChromotingHostMessage* msg);
69 void BeginUpdate(HostMessage* msg); 69 void BeginUpdate(ChromotingHostMessage* msg);
70 void HandleUpdate(HostMessage* msg); 70 void HandleUpdate(ChromotingHostMessage* msg);
71 void EndUpdate(HostMessage* msg); 71 void EndUpdate(ChromotingHostMessage* msg);
72 72
73 // The following are not owned by this class. 73 // The following are not owned by this class.
74 ClientConfig config_; 74 ClientConfig config_;
75 ClientContext* context_; 75 ClientContext* context_;
76 HostConnection* connection_; 76 HostConnection* connection_;
77 ChromotingView* view_; 77 ChromotingView* view_;
78 InputHandler* input_handler_; 78 InputHandler* input_handler_;
79 79
80 // If non-NULL, this is called when the client is done. 80 // If non-NULL, this is called when the client is done.
81 CancelableTask* client_done_; 81 CancelableTask* client_done_;
82 82
83 State state_; 83 State state_;
84 84
85 DISALLOW_COPY_AND_ASSIGN(ChromotingClient); 85 DISALLOW_COPY_AND_ASSIGN(ChromotingClient);
86 }; 86 };
87 87
88 } // namespace remoting 88 } // namespace remoting
89 89
90 DISABLE_RUNNABLE_METHOD_REFCOUNT(remoting::ChromotingClient); 90 DISABLE_RUNNABLE_METHOD_REFCOUNT(remoting::ChromotingClient);
91 91
92 #endif // REMOTING_CLIENT_CHROMOTING_CLIENT_H 92 #endif // REMOTING_CLIENT_CHROMOTING_CLIENT_H
OLDNEW
« no previous file with comments | « remoting/base/protocol_decoder_unittest.cc ('k') | remoting/client/chromoting_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698