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/plugin | |
| 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/plugin')
| -rw-r--r-- | chrome/plugin/plugin_channel.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/chrome/plugin/plugin_channel.cc b/chrome/plugin/plugin_channel.cc index 74a2ac0..205b3fa 100644 --- a/chrome/plugin/plugin_channel.cc +++ b/chrome/plugin/plugin_channel.cc @@ -5,9 +5,9 @@ #include "chrome/plugin/plugin_channel.h" #include "base/command_line.h" -#include "base/lock.h" #include "base/process_util.h" #include "base/string_util.h" +#include "base/synchronization/lock.h" #include "base/synchronization/waitable_event.h" #include "build/build_config.h" #include "chrome/common/child_process.h" @@ -50,7 +50,7 @@ class PluginChannel::MessageFilter : public IPC::ChannelProxy::MessageFilter { base::WaitableEvent* GetModalDialogEvent( gfx::NativeViewId containing_window) { - AutoLock auto_lock(modal_dialog_event_map_lock_); + base::AutoLock auto_lock(modal_dialog_event_map_lock_); if (!modal_dialog_event_map_.count(containing_window)) { NOTREACHED(); return NULL; @@ -62,7 +62,7 @@ class PluginChannel::MessageFilter : public IPC::ChannelProxy::MessageFilter { // Decrement the ref count associated with the modal dialog event for the // given tab. void ReleaseModalDialogEvent(gfx::NativeViewId containing_window) { - AutoLock auto_lock(modal_dialog_event_map_lock_); + base::AutoLock auto_lock(modal_dialog_event_map_lock_); if (!modal_dialog_event_map_.count(containing_window)) { NOTREACHED(); return; @@ -98,7 +98,7 @@ class PluginChannel::MessageFilter : public IPC::ChannelProxy::MessageFilter { } void OnInit(const PluginMsg_Init_Params& params, IPC::Message* reply_msg) { - AutoLock auto_lock(modal_dialog_event_map_lock_); + base::AutoLock auto_lock(modal_dialog_event_map_lock_); if (modal_dialog_event_map_.count(params.containing_window)) { modal_dialog_event_map_[params.containing_window].refcount++; return; @@ -111,13 +111,13 @@ class PluginChannel::MessageFilter : public IPC::ChannelProxy::MessageFilter { } void OnSignalModalDialogEvent(gfx::NativeViewId containing_window) { - AutoLock auto_lock(modal_dialog_event_map_lock_); + base::AutoLock auto_lock(modal_dialog_event_map_lock_); if (modal_dialog_event_map_.count(containing_window)) modal_dialog_event_map_[containing_window].event->Signal(); } void OnResetModalDialogEvent(gfx::NativeViewId containing_window) { - AutoLock auto_lock(modal_dialog_event_map_lock_); + base::AutoLock auto_lock(modal_dialog_event_map_lock_); if (modal_dialog_event_map_.count(containing_window)) modal_dialog_event_map_[containing_window].event->Reset(); } @@ -128,7 +128,7 @@ class PluginChannel::MessageFilter : public IPC::ChannelProxy::MessageFilter { }; typedef std::map<gfx::NativeViewId, WaitableEventWrapper> ModalDialogEventMap; ModalDialogEventMap modal_dialog_event_map_; - Lock modal_dialog_event_map_lock_; + base::Lock modal_dialog_event_map_lock_; IPC::Channel* channel_; }; |