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

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

Issue 6142009: Upating the app, ceee, chrome, ipc, media, and net directories to use the correct lock.h file. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Unified patch updating all references to the new base/synchronization/lock.h Created 9 years, 11 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
« no previous file with comments | « remoting/host/capturer.cc ('k') | remoting/host/chromoting_host.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 #ifndef REMOTING_CHROMOTING_HOST_H_ 5 #ifndef REMOTING_CHROMOTING_HOST_H_
6 #define REMOTING_CHROMOTING_HOST_H_ 6 #define REMOTING_CHROMOTING_HOST_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/threading/thread.h" 10 #include "base/threading/thread.h"
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 // This task gets executed when this object fails to connect to the 167 // This task gets executed when this object fails to connect to the
168 // talk network or Shutdown() is called. 168 // talk network or Shutdown() is called.
169 scoped_ptr<Task> shutdown_task_; 169 scoped_ptr<Task> shutdown_task_;
170 170
171 // Tracks the internal state of the host. 171 // Tracks the internal state of the host.
172 // This variable is written on the main thread of ChromotingHostContext 172 // This variable is written on the main thread of ChromotingHostContext
173 // and read by jingle thread. 173 // and read by jingle thread.
174 State state_; 174 State state_;
175 175
176 // Lock is to lock the access to |state_|. 176 // Lock is to lock the access to |state_|.
177 Lock lock_; 177 base::Lock lock_;
178 178
179 // Configuration of the protocol. 179 // Configuration of the protocol.
180 scoped_ptr<protocol::CandidateSessionConfig> protocol_config_; 180 scoped_ptr<protocol::CandidateSessionConfig> protocol_config_;
181 181
182 DISALLOW_COPY_AND_ASSIGN(ChromotingHost); 182 DISALLOW_COPY_AND_ASSIGN(ChromotingHost);
183 }; 183 };
184 184
185 } // namespace remoting 185 } // namespace remoting
186 186
187 #endif // REMOTING_HOST_CHROMOTING_HOST_H_ 187 #endif // REMOTING_HOST_CHROMOTING_HOST_H_
OLDNEW
« no previous file with comments | « remoting/host/capturer.cc ('k') | remoting/host/chromoting_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698