diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-21 04:55:52 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-21 04:55:52 +0000 |
| commit | 20305ec6f1acf21392c2f3938a14a96f1e28e76d (patch) | |
| tree | 6eff1f7be4bad1a1362d3466f0ac59292dc51acc /remoting/jingle_glue/jingle_client.h | |
| parent | c6e8346b56ab61b35845aefcf9b241c654fe1253 (diff) | |
| download | chromium_src-20305ec6f1acf21392c2f3938a14a96f1e28e76d.zip chromium_src-20305ec6f1acf21392c2f3938a14a96f1e28e76d.tar.gz chromium_src-20305ec6f1acf21392c2f3938a14a96f1e28e76d.tar.bz2 | |
Remove obsolete base/lock.h and fix up callers to use the new header file and
the base namespace. Fix several files including lock.h unnecessarily.
BUG=none
TEST=none
Original review=http://codereview.chromium.org/6142009/
Patch by leviw@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72106 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/jingle_glue/jingle_client.h')
| -rw-r--r-- | remoting/jingle_glue/jingle_client.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/remoting/jingle_glue/jingle_client.h b/remoting/jingle_glue/jingle_client.h index 1d0920a..173e90e 100644 --- a/remoting/jingle_glue/jingle_client.h +++ b/remoting/jingle_glue/jingle_client.h @@ -7,8 +7,8 @@ #include <string> -#include "base/lock.h" #include "base/ref_counted.h" +#include "base/synchronization/lock.h" #include "third_party/libjingle/source/talk/xmpp/xmppclient.h" class MessageLoop; @@ -123,11 +123,12 @@ class JingleClient : public base::RefCountedThreadSafe<JingleClient>, // The XmppClient and its state and jid. buzz::XmppClient* client_; State state_; - Lock full_jid_lock_; + base::Lock full_jid_lock_; std::string full_jid_; // Current state of the object. - Lock state_lock_; // Must be locked when accessing initialized_ or closed_. + // Must be locked when accessing initialized_ or closed_. + base::Lock state_lock_; bool initialized_; bool closed_; scoped_ptr<Task> closed_task_; |