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

Unified Diff: remoting/host/chromoting_host.cc

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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/host/chromoting_host.h ('k') | remoting/host/in_memory_host_config.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/chromoting_host.cc
diff --git a/remoting/host/chromoting_host.cc b/remoting/host/chromoting_host.cc
index a06098c4ce6cd22a7e97da87b787d235ce776260..45be6137a428b45d9568bc07c88af76d82cf83d8 100644
--- a/remoting/host/chromoting_host.cc
+++ b/remoting/host/chromoting_host.cc
@@ -70,7 +70,7 @@ void ChromotingHost::Start(Task* shutdown_task) {
// Make sure this object is not started.
{
- AutoLock auto_lock(lock_);
+ base::AutoLock auto_lock(lock_);
if (state_ != kInitial)
return;
state_ = kStarted;
@@ -113,7 +113,7 @@ void ChromotingHost::Shutdown() {
// No-op if this object is not started yet.
{
- AutoLock auto_lock(lock_);
+ base::AutoLock auto_lock(lock_);
if (state_ != kStarted) {
state_ = kStopped;
return;
@@ -264,7 +264,7 @@ void ChromotingHost::OnStateChange(JingleClient* jingle_client,
void ChromotingHost::OnNewClientSession(
protocol::Session* session,
protocol::SessionManager::IncomingSessionResponse* response) {
- AutoLock auto_lock(lock_);
+ base::AutoLock auto_lock(lock_);
// TODO(hclam): Allow multiple clients to connect to the host.
if (connection_.get() || state_ != kStarted) {
*response = protocol::SessionManager::DECLINE;
« no previous file with comments | « remoting/host/chromoting_host.h ('k') | remoting/host/in_memory_host_config.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698