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 /chrome_frame/cfproxy_private.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 'chrome_frame/cfproxy_private.h')
-rw-r--r-- | chrome_frame/cfproxy_private.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome_frame/cfproxy_private.h b/chrome_frame/cfproxy_private.h index 307dcae..3979e0eb 100644 --- a/chrome_frame/cfproxy_private.h +++ b/chrome_frame/cfproxy_private.h @@ -10,6 +10,7 @@ #include <set> #include <string> #include <vector> + #include "chrome_frame/cfproxy.h" #include "base/threading/thread.h" // Since we can't forward declare IPC::Message::Sender or IPC::Channel::Listener @@ -55,7 +56,7 @@ class SyncMsgSender { SingleSentMessage* RemoveMessage(int id); typedef std::map<int, SingleSentMessage*> SentMessages; SentMessages messages_; - Lock messages_lock_; + base::Lock messages_lock_; TabsMap* tab2delegate_; }; |