summaryrefslogtreecommitdiffstats
path: root/chrome/browser/navigation_controller.h
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/browser/navigation_controller.h
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/browser/navigation_controller.h')
-rw-r--r--chrome/browser/navigation_controller.h8
1 files changed, 3 insertions, 5 deletions
diff --git a/chrome/browser/navigation_controller.h b/chrome/browser/navigation_controller.h
index b57700d..976313e 100644
--- a/chrome/browser/navigation_controller.h
+++ b/chrome/browser/navigation_controller.h
@@ -5,8 +5,7 @@
#ifndef CHROME_BROWSER_NAVIGATION_CONTROLLER_H_
#define CHROME_BROWSER_NAVIGATION_CONTROLLER_H_
-#include <hash_map>
-
+#include "base/hash_tables.h"
#include "base/linked_ptr.h"
#include "base/ref_counted.h"
#include "chrome/browser/alternate_nav_url_fetcher.h"
@@ -421,12 +420,12 @@ class NavigationController {
// Tab contents. One entry per type used. The tab controller owns
// every tab contents used.
- typedef stdext::hash_map<TabContentsType, TabContents*> TabContentsMap;
+ typedef base::hash_map<TabContentsType, TabContents*> TabContentsMap;
TabContentsMap tab_contents_map_;
// A map of TabContentsType -> TabContentsCollector containing all the
// pending collectors.
- typedef stdext::hash_map<TabContentsType, TabContentsCollector*>
+ typedef base::hash_map<TabContentsType, TabContentsCollector*>
TabContentsCollectorMap;
TabContentsCollectorMap tab_contents_collector_map_;
@@ -471,4 +470,3 @@ class NavigationController {
};
#endif // CHROME_BROWSER_NAVIGATION_CONTROLLER_H_
-