summaryrefslogtreecommitdiffstats
path: root/chrome/plugin
diff options
context:
space:
mode:
authorerg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-08 20:51:30 +0000
committererg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-08 20:51:30 +0000
commit2314403e94e659d586475e59975e9d84d87cbcd3 (patch)
treeb6abf72ec953e61297307a62ad67517c273bdddb /chrome/plugin
parente9fe92b3357e9010d14dcf628fe3dd7dad830a20 (diff)
downloadchromium_src-2314403e94e659d586475e59975e9d84d87cbcd3.zip
chromium_src-2314403e94e659d586475e59975e9d84d87cbcd3.tar.gz
chromium_src-2314403e94e659d586475e59975e9d84d87cbcd3.tar.bz2
Replace all instances of <hash_map> with a "base/hash_tabe.h",
which does the right thing based on whatever platform we're compiling for, along with changing the hardcoded "stdext::", which is a MSVC++ism to use base::hash_{map,set}. B=1869 Review URL: http://codereview.chromium.org/1629 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1862 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/plugin')
-rw-r--r--chrome/plugin/plugin_channel_base.cc5
-rw-r--r--chrome/plugin/plugin_channel_base.h5
-rw-r--r--chrome/plugin/webplugin_proxy.h6
3 files changed, 6 insertions, 10 deletions
diff --git a/chrome/plugin/plugin_channel_base.cc b/chrome/plugin/plugin_channel_base.cc
index 49a91fe..c44c52e 100644
--- a/chrome/plugin/plugin_channel_base.cc
+++ b/chrome/plugin/plugin_channel_base.cc
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include <hash_map>
#include <windows.h>
#include "chrome/plugin/plugin_channel_base.h"
+#include "base/hash_tables.h"
#include "chrome/common/ipc_sync_message.h"
#include "chrome/plugin/plugin_process.h"
-typedef stdext::hash_map<std::wstring, scoped_refptr<PluginChannelBase> >
+typedef base::hash_map<std::wstring, scoped_refptr<PluginChannelBase> >
PluginChannelMap;
static PluginChannelMap g_plugin_channels_;
@@ -191,4 +191,3 @@ void PluginChannelBase::OnChannelError() {
void PluginChannelBase::SendUnblockingOnlyDuringDispatch() {
send_unblocking_only_during_dispatch_ = true;
}
-
diff --git a/chrome/plugin/plugin_channel_base.h b/chrome/plugin/plugin_channel_base.h
index 317f0a6..dd70cba 100644
--- a/chrome/plugin/plugin_channel_base.h
+++ b/chrome/plugin/plugin_channel_base.h
@@ -5,10 +5,10 @@
#ifndef CHROME_WEBKIT_GLUE_PLUGIN_CHANNEL_BASE_H__
#define CHROME_WEBKIT_GLUE_PLUGIN_CHANNEL_BASE_H__
-#include <hash_map>
#include <string>
#include "base/basictypes.h"
+#include "base/hash_tables.h"
#include "base/message_loop.h"
#include "base/ref_counted.h"
#include "base/scoped_ptr.h"
@@ -97,7 +97,7 @@ class PluginChannelBase : public IPC::Channel::Listener,
// Keep track of all the registered NPObjects proxies/stubs so that when the
// channel is closed we can inform them.
- typedef stdext::hash_map<int, IPC::Channel::Listener*> ListenerMap;
+ typedef base::hash_map<int, IPC::Channel::Listener*> ListenerMap;
ListenerMap npobject_listeners_;
// Used to implement message routing functionality to WebPlugin[Delegate]
@@ -117,4 +117,3 @@ class PluginChannelBase : public IPC::Channel::Listener,
};
#endif // CHROME_WEBKIT_GLUE_PLUGIN_CHANNEL_BASE_H__
-
diff --git a/chrome/plugin/webplugin_proxy.h b/chrome/plugin/webplugin_proxy.h
index af1e4b6..5bad3f9 100644
--- a/chrome/plugin/webplugin_proxy.h
+++ b/chrome/plugin/webplugin_proxy.h
@@ -5,8 +5,7 @@
#ifndef CHROME_PLUGIN_PLUGIN_WEBPLUGIN_PROXY_H__
#define CHROME_PLUGIN_PLUGIN_WEBPLUGIN_PROXY_H__
-#include <hash_map>
-
+#include "base/hash_tables.h"
#include "base/ref_counted.h"
#include "base/scoped_handle.h"
#include "chrome/common/ipc_message.h"
@@ -77,7 +76,7 @@ class WebPluginProxy : public WebPlugin {
private:
bool Send(IPC::Message* msg);
- typedef stdext::hash_map<int, WebPluginResourceClient*> ResourceClientMap;
+ typedef base::hash_map<int, WebPluginResourceClient*> ResourceClientMap;
ResourceClientMap resource_clients_;
scoped_refptr<PluginChannel> channel_;
@@ -92,4 +91,3 @@ class WebPluginProxy : public WebPlugin {
};
#endif // CHROME_PLUGIN_PLUGIN_WEBPLUGIN_PROXY_H__
-