summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/browsing_instance.h8
-rw-r--r--chrome/browser/controller.h5
-rw-r--r--chrome/browser/download_file.h14
-rw-r--r--chrome/browser/download_manager.h5
-rw-r--r--chrome/browser/download_tab_view.cc6
-rw-r--r--chrome/browser/download_tab_view.h7
-rw-r--r--chrome/browser/icon_manager.h5
-rw-r--r--chrome/browser/navigation_controller.h8
-rw-r--r--chrome/browser/plugin_service.h5
-rw-r--r--chrome/browser/render_widget_helper.h7
-rw-r--r--chrome/browser/safe_browsing/protocol_manager.h7
-rw-r--r--chrome/browser/safe_browsing/protocol_parser_unittest.cc3
-rw-r--r--chrome/browser/safe_browsing/safe_browsing_database.h5
-rw-r--r--chrome/browser/safe_browsing/safe_browsing_service.h5
-rw-r--r--chrome/browser/save_file_manager.h12
-rw-r--r--chrome/browser/save_package.h12
-rw-r--r--chrome/browser/web_contents.h8
-rw-r--r--chrome/browser/webdata/web_database.h2
18 files changed, 49 insertions, 75 deletions
diff --git a/chrome/browser/browsing_instance.h b/chrome/browser/browsing_instance.h
index d62e523..e4b6043 100644
--- a/chrome/browser/browsing_instance.h
+++ b/chrome/browser/browsing_instance.h
@@ -5,8 +5,7 @@
#ifndef CHROME_BROWSER_BROWSING_INSTANCE_H__
#define CHROME_BROWSER_BROWSING_INSTANCE_H__
-#include <hash_map>
-
+#include "base/hash_tables.h"
#include "chrome/browser/profile.h"
#include "googleurl/src/gurl.h"
@@ -95,10 +94,10 @@ class BrowsingInstance : public base::RefCounted<BrowsingInstance> {
// Map of site to SiteInstance, to ensure we only have one SiteInstance per
// site. The site string should be the possibly_invalid_spec() of a GURL
// obtained with SiteInstance::GetSiteForURL.
- typedef stdext::hash_map<std::string, SiteInstance*> SiteInstanceMap;
+ typedef base::hash_map<std::string, SiteInstance*> SiteInstanceMap;
// Map of Profile to SiteInstanceMap, for use in the process-per-site model.
- typedef stdext::hash_map<Profile*, SiteInstanceMap> ProfileSiteInstanceMap;
+ typedef base::hash_map<Profile*, SiteInstanceMap> ProfileSiteInstanceMap;
// Returns a pointer to the relevant SiteInstanceMap for this object. If the
// process-per-site model is in use, or if process-per-site-instance is in
@@ -127,4 +126,3 @@ class BrowsingInstance : public base::RefCounted<BrowsingInstance> {
};
#endif // CHROME_BROWSER_BROWSING_INSTANCE_H__
-
diff --git a/chrome/browser/controller.h b/chrome/browser/controller.h
index 2e943a6..74825f3 100644
--- a/chrome/browser/controller.h
+++ b/chrome/browser/controller.h
@@ -5,10 +5,10 @@
#ifndef CHROME_BROWSER_CONTROLLER_H__
#define CHROME_BROWSER_CONTROLLER_H__
-#include <hash_map>
#include <vector>
#include "base/basictypes.h"
+#include "base/hash_tables.h"
#include "chrome/views/button.h"
#include "chrome/views/controller.h"
@@ -65,7 +65,7 @@ struct Command {
bool enabled;
CommandObserverList* observers;
};
-typedef stdext::hash_map<int, Command*> CommandMap;
+typedef base::hash_map<int, Command*> CommandMap;
///////////////////////////////////////////////////////////////////////////////
@@ -171,4 +171,3 @@ class CommandController : public Controller {
};
#endif // CHROME_BROWSER_CONTROLLER_H__
-
diff --git a/chrome/browser/download_file.h b/chrome/browser/download_file.h
index 4b50c13..2f9a55a 100644
--- a/chrome/browser/download_file.h
+++ b/chrome/browser/download_file.h
@@ -41,12 +41,11 @@
#ifndef CHROME_BROWSER_DOWNLOAD_FILE_H__
#define CHROME_BROWSER_DOWNLOAD_FILE_H__
-#include <hash_map>
-#include <hash_set>
#include <string>
#include <vector>
#include "base/basictypes.h"
+#include "base/hash_tables.h"
#include "base/lock.h"
#include "base/ref_counted.h"
#include "base/thread.h"
@@ -234,7 +233,7 @@ class DownloadFileManager
int next_id_;
// A map of all in progress downloads.
- typedef stdext::hash_map<int, DownloadFile*> DownloadFileMap;
+ typedef base::hash_map<int, DownloadFile*> DownloadFileMap;
DownloadFileMap downloads_;
// Throttle updates to the UI thread.
@@ -253,18 +252,18 @@ class DownloadFileManager
// Tracking which DownloadManager to send data to, called only on UI thread.
// DownloadManagerMap maps download IDs to their DownloadManager.
- typedef stdext::hash_map<int, DownloadManager*> DownloadManagerMap;
+ typedef base::hash_map<int, DownloadManager*> DownloadManagerMap;
DownloadManagerMap managers_;
// RequestMap maps a DownloadManager to all in-progress download IDs.
// Called only on the UI thread.
- typedef stdext::hash_set<int> DownloadRequests;
- typedef stdext::hash_map<DownloadManager*, DownloadRequests> RequestMap;
+ typedef base::hash_set<int> DownloadRequests;
+ typedef base::hash_map<DownloadManager*, DownloadRequests> RequestMap;
RequestMap requests_;
// Used for progress updates on the UI thread, mapping download->id() to bytes
// received so far. Written to by the file thread and read by the UI thread.
- typedef stdext::hash_map<int, int64> ProgressMap;
+ typedef base::hash_map<int, int64> ProgressMap;
ProgressMap ui_progress_;
Lock progress_lock_;
@@ -272,4 +271,3 @@ class DownloadFileManager
};
#endif // CHROME_BROWSER_DOWNLOAD_FILE_H__
-
diff --git a/chrome/browser/download_manager.h b/chrome/browser/download_manager.h
index a9ffc27..498383a 100644
--- a/chrome/browser/download_manager.h
+++ b/chrome/browser/download_manager.h
@@ -36,12 +36,12 @@
#define CHROME_BROWSER_DOWNLOAD_MANAGER_H__
#include <string>
-#include <hash_map>
#include <map>
#include <set>
#include <vector>
#include "base/basictypes.h"
+#include "base/hash_tables.h"
#include "base/observer_list.h"
#include "base/ref_counted.h"
#include "chrome/browser/cancelable_request.h"
@@ -423,7 +423,7 @@ class DownloadManager : public base::RefCountedThreadSafe<DownloadManager>,
// past sessions read from a persisted state from the history system are
// placed directly into 'downloads_' since they have valid handles in the
// history system.
- typedef stdext::hash_map<int64, DownloadItem*> DownloadMap;
+ typedef base::hash_map<int64, DownloadItem*> DownloadMap;
DownloadMap downloads_;
DownloadMap in_progress_;
@@ -481,4 +481,3 @@ class DownloadManager : public base::RefCountedThreadSafe<DownloadManager>,
#endif // CHROME_BROWSER_DOWNLOAD_MANAGER_H__
-
diff --git a/chrome/browser/download_tab_view.cc b/chrome/browser/download_tab_view.cc
index 56b7c3e..f5f6ceb 100644
--- a/chrome/browser/download_tab_view.cc
+++ b/chrome/browser/download_tab_view.cc
@@ -809,7 +809,7 @@ void DownloadTabView::OnDownloadUpdated(DownloadItem* download) {
switch (download->state()) {
case DownloadItem::COMPLETE:
case DownloadItem::CANCELLED: {
- stdext::hash_set<DownloadItem*>::iterator d = in_progress_.find(download);
+ base::hash_set<DownloadItem*>::iterator d = in_progress_.find(download);
if (d != in_progress_.end()) {
(*d)->RemoveObserver(this);
in_progress_.erase(d);
@@ -824,7 +824,7 @@ void DownloadTabView::OnDownloadUpdated(DownloadItem* download) {
// further progress updates until at least one download is active again.
if (download->is_paused()) {
bool continue_update = false;
- stdext::hash_set<DownloadItem*>::iterator it = in_progress_.begin();
+ base::hash_set<DownloadItem*>::iterator it = in_progress_.begin();
for (; it != in_progress_.end(); ++it) {
if (!(*it)->is_paused()) {
continue_update = true;
@@ -937,7 +937,7 @@ void DownloadTabView::LoadIcon(DownloadItem* download) {
}
void DownloadTabView::ClearDownloadInProgress() {
- for (stdext::hash_set<DownloadItem*>::iterator it = in_progress_.begin();
+ for (base::hash_set<DownloadItem*>::iterator it = in_progress_.begin();
it != in_progress_.end(); ++it)
(*it)->RemoveObserver(this);
in_progress_.clear();
diff --git a/chrome/browser/download_tab_view.h b/chrome/browser/download_tab_view.h
index 92ca343..29aff8f 100644
--- a/chrome/browser/download_tab_view.h
+++ b/chrome/browser/download_tab_view.h
@@ -5,9 +5,7 @@
#ifndef CHROME_BROWSER_DONWLOAD_TAB_VIEW_H__
#define CHROME_BROWSER_DONWLOAD_TAB_VIEW_H__
-#include <hash_map>
-#include <hash_set>
-
+#include "base/hash_tables.h"
#include "chrome/browser/cancelable_request.h"
#include "chrome/browser/download_manager.h"
#include "chrome/browser/download_util.h"
@@ -178,7 +176,7 @@ class DownloadTabView : public ChromeViews::View,
// Since this view manages the progress animation timers for all the floating
// views, we need to track the current in progress downloads. This container
// does not own the DownloadItems.
- stdext::hash_set<DownloadItem*> in_progress_;
+ base::hash_set<DownloadItem*> in_progress_;
// Provide a start position for downloads with no known size.
int start_angle_;
@@ -252,4 +250,3 @@ class DownloadTabUI : public NativeUI,
};
#endif // CHROME_BROWSER_DONWLOAD_TAB_VIEW_H__
-
diff --git a/chrome/browser/icon_manager.h b/chrome/browser/icon_manager.h
index 9b26854..ad6a4eb 100644
--- a/chrome/browser/icon_manager.h
+++ b/chrome/browser/icon_manager.h
@@ -42,13 +42,12 @@
#ifndef CHROME_BROWSER_ICON_MANAGER_H__
#define CHROME_BROWSER_ICON_MANAGER_H__
-#include <hash_map>
#include <map>
#include <set>
#include <string>
+#include "base/hash_tables.h"
#include "chrome/browser/icon_loader.h"
-
#include "chrome/browser/cancelable_request.h"
class SkBitmap;
@@ -107,7 +106,7 @@ private:
} ClientRequest;
// Asynchronous requests that have not yet been completed.
- typedef stdext::hash_map<IconLoader*, ClientRequest> ClientRequests;
+ typedef base::hash_map<IconLoader*, ClientRequest> ClientRequests;
ClientRequests requests_;
DISALLOW_EVIL_CONSTRUCTORS(IconManager);
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_
-
diff --git a/chrome/browser/plugin_service.h b/chrome/browser/plugin_service.h
index ba33fd2..a28b502 100644
--- a/chrome/browser/plugin_service.h
+++ b/chrome/browser/plugin_service.h
@@ -9,9 +9,9 @@
#define CHROME_BROWSER_PLUGIN_SERVICE_H__
#include <vector>
-#include <hash_map>
#include "base/basictypes.h"
+#include "base/hash_tables.h"
#include "base/lock.h"
#include "chrome/browser/browser_process.h"
#include "webkit/glue/webplugin.h"
@@ -121,7 +121,7 @@ class PluginService {
void OnShutdown();
// mapping between plugin dll path and PluginProcessHost
- typedef stdext::hash_map<std::wstring, PluginProcessHost*> PluginMap;
+ typedef base::hash_map<std::wstring, PluginProcessHost*> PluginMap;
PluginMap plugin_hosts_;
// The main thread's message loop.
@@ -214,4 +214,3 @@ class PluginProcessHostIterator {
};
#endif // CHROME_BROWSER_PLUGIN_SERVICE_H__
-
diff --git a/chrome/browser/render_widget_helper.h b/chrome/browser/render_widget_helper.h
index 35252d7..c7763b4 100644
--- a/chrome/browser/render_widget_helper.h
+++ b/chrome/browser/render_widget_helper.h
@@ -1,3 +1,4 @@
+
// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -5,9 +6,8 @@
#ifndef CHROME_BROWSER_RENDER_WIDGET_HELPER_H__
#define CHROME_BROWSER_RENDER_WIDGET_HELPER_H__
-#include <hash_map>
-
#include "base/atomic_sequence_num.h"
+#include "base/hash_tables.h"
#include "base/ref_counted.h"
#include "base/lock.h"
@@ -119,7 +119,7 @@ class RenderWidgetHelper :
friend PaintMsgProxy;
// Map from render_widget_id to live PaintMsgProxy instance.
- typedef stdext::hash_map<int, PaintMsgProxy*> PaintMsgProxyMap;
+ typedef base::hash_map<int, PaintMsgProxy*> PaintMsgProxyMap;
// Called on the UI thread to dispatch a paint message if necessary.
void OnDispatchPaintMsg(PaintMsgProxy* proxy);
@@ -158,4 +158,3 @@ class RenderWidgetHelper :
};
#endif // CHROME_BROWSER_RENDER_WIDGET_HELPER_H__
-
diff --git a/chrome/browser/safe_browsing/protocol_manager.h b/chrome/browser/safe_browsing/protocol_manager.h
index 3a6bc74..c107a00 100644
--- a/chrome/browser/safe_browsing/protocol_manager.h
+++ b/chrome/browser/safe_browsing/protocol_manager.h
@@ -11,10 +11,10 @@
// The SafeBrowsingProtocolParser class to do the actual parsing.
#include <deque>
-#include <hash_map>
#include <string>
#include <vector>
+#include "base/hash_tables.h"
#include "base/scoped_ptr.h"
#include "base/time.h"
#include "chrome/browser/url_fetcher.h"
@@ -166,8 +166,8 @@ class SafeBrowsingProtocolManager : public URLFetcher::Delegate {
std::deque<ChunkUrl> chunk_request_urls_;
// Map of GetHash requests.
- typedef stdext::hash_map<const URLFetcher*,
- SafeBrowsingService::SafeBrowsingCheck*> HashRequests;
+ typedef base::hash_map<const URLFetcher*,
+ SafeBrowsingService::SafeBrowsingCheck*> HashRequests;
HashRequests hash_requests_;
// The next scheduled update has special behavior for the first 2 requests.
@@ -205,4 +205,3 @@ class SafeBrowsingProtocolManager : public URLFetcher::Delegate {
};
#endif // CHROME_BROWSER_SAFE_BROWSING_PROTOCOL_MANAGER_H__
-
diff --git a/chrome/browser/safe_browsing/protocol_parser_unittest.cc b/chrome/browser/safe_browsing/protocol_parser_unittest.cc
index e171d4c..a6d16d5 100644
--- a/chrome/browser/safe_browsing/protocol_parser_unittest.cc
+++ b/chrome/browser/safe_browsing/protocol_parser_unittest.cc
@@ -4,8 +4,7 @@
//
// Program to test the SafeBrowsing protocol parsing v2.1.
-#include <hash_map>
-
+#include "base/hash_tables.h"
#include "base/logging.h"
#include "base/string_util.h"
#include "base/win_util.h"
diff --git a/chrome/browser/safe_browsing/safe_browsing_database.h b/chrome/browser/safe_browsing/safe_browsing_database.h
index 4b4fe47..872f76e 100644
--- a/chrome/browser/safe_browsing/safe_browsing_database.h
+++ b/chrome/browser/safe_browsing/safe_browsing_database.h
@@ -5,11 +5,11 @@
#ifndef CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_DATABASE_H__
#define CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_DATABASE_H__
-#include <hash_map>
#include <list>
#include <queue>
#include <vector>
+#include "base/hash_tables.h"
#include "base/scoped_ptr.h"
#include "base/task.h"
#include "base/time.h"
@@ -288,7 +288,7 @@ class SafeBrowsingDatabase {
} HashCacheEntry;
typedef std::list<HashCacheEntry> HashList;
- typedef stdext::hash_map<SBPrefix, HashList> HashCache;
+ typedef base::hash_map<SBPrefix, HashList> HashCache;
HashCache hash_cache_;
// Cache of prefixes that returned empty results (no full hash match).
@@ -301,4 +301,3 @@ class SafeBrowsingDatabase {
};
#endif // CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_DATABASE_H__
-
diff --git a/chrome/browser/safe_browsing/safe_browsing_service.h b/chrome/browser/safe_browsing/safe_browsing_service.h
index 6f10b81..478fee4 100644
--- a/chrome/browser/safe_browsing/safe_browsing_service.h
+++ b/chrome/browser/safe_browsing/safe_browsing_service.h
@@ -9,11 +9,11 @@
#define CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_SERVICE_H__
#include <deque>
-#include <hash_map>
#include <set>
#include <string>
#include <vector>
+#include "base/hash_tables.h"
#include "base/ref_counted.h"
#include "base/scoped_ptr.h"
#include "base/thread.h"
@@ -220,7 +220,7 @@ class SafeBrowsingService
// Used for issuing only one GetHash request for a given prefix.
typedef std::vector<SafeBrowsingCheck*> GetHashRequestors;
- typedef stdext::hash_map<SBPrefix, GetHashRequestors> GetHashRequests;
+ typedef base::hash_map<SBPrefix, GetHashRequestors> GetHashRequests;
GetHashRequests gethash_requests_;
// The sqlite database. We don't use a scoped_ptr because it needs to be
@@ -254,4 +254,3 @@ class SafeBrowsingService
};
#endif // CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_SERVICE_H__
-
diff --git a/chrome/browser/save_file_manager.h b/chrome/browser/save_file_manager.h
index 23631e0..19630dc 100644
--- a/chrome/browser/save_file_manager.h
+++ b/chrome/browser/save_file_manager.h
@@ -58,11 +58,10 @@
#ifndef CHROME_BROWSER_SAVE_FILE_MANAGER_H__
#define CHROME_BROWSER_SAVE_FILE_MANAGER_H__
-#include <hash_map>
-#include <hash_set>
#include <utility>
#include "base/basictypes.h"
+#include "base/hash_tables.h"
#include "base/ref_counted.h"
#include "base/thread.h"
#include "chrome/browser/save_types.h"
@@ -222,7 +221,7 @@ class SaveFileManager
int next_id_;
// A map of all saving jobs by using save id.
- typedef stdext::hash_map<int, SaveFile*> SaveFileMap;
+ typedef base::hash_map<int, SaveFile*> SaveFileMap;
SaveFileMap save_file_map_;
// Message loop that the SavePackages live on.
@@ -240,7 +239,7 @@ class SaveFileManager
// Tracks which SavePackage to send data to, called only on UI thread.
// SavePackageMap maps save IDs to their SavePackage.
- typedef stdext::hash_map<int, SavePackage*> SavePackageMap;
+ typedef base::hash_map<int, SavePackage*> SavePackageMap;
SavePackageMap packages_;
// There is a gap between after calling SaveURL() and before calling
@@ -253,12 +252,11 @@ class SaveFileManager
// use a hashmap to map the tab id (we actually use render_process_id) to the
// hashmap since it is possible to save same URL in different tab at
// same time.
- typedef stdext::hash_map<std::wstring, SavePackage*> StartingRequestsMap;
- typedef stdext::hash_map<int, StartingRequestsMap> TabToStartingRequestsMap;
+ typedef base::hash_map<std::wstring, SavePackage*> StartingRequestsMap;
+ typedef base::hash_map<int, StartingRequestsMap> TabToStartingRequestsMap;
TabToStartingRequestsMap tab_starting_requests_;
DISALLOW_EVIL_CONSTRUCTORS(SaveFileManager);
};
#endif // CHROME_BROWSER_SAVE_FILE_MANAGER_H__
-
diff --git a/chrome/browser/save_package.h b/chrome/browser/save_package.h
index 29a22b9..07deb91 100644
--- a/chrome/browser/save_package.h
+++ b/chrome/browser/save_package.h
@@ -19,13 +19,12 @@
#define CHROME_BROWSER_SAVE_PACKAGE_H__
#include <string>
-#include <hash_map>
-#include <hash_set>
#include <vector>
#include <queue>
#include <utility>
#include "base/basictypes.h"
+#include "base/hash_tables.h"
#include "base/ref_counted.h"
#include "base/time.h"
#include "chrome/common/pref_member.h"
@@ -233,7 +232,7 @@ class SavePackage : public base::RefCountedThreadSafe<SavePackage> {
SaveItem* LookupItemInProcessBySaveId(int32 save_id);
void PutInProgressItemToSavedMap(SaveItem* save_item);
- typedef stdext::hash_map<std::wstring, SaveItem*> SaveUrlItemMap;
+ typedef base::hash_map<std::wstring, SaveItem*> SaveUrlItemMap;
// in_progress_items_ is map of all saving job in in-progress state.
SaveUrlItemMap in_progress_items_;
// saved_failed_items_ is map of all saving job which are failed.
@@ -255,7 +254,7 @@ class SavePackage : public base::RefCountedThreadSafe<SavePackage> {
// A queue for items we are about to start saving.
SaveItemQueue waiting_item_queue_;
- typedef stdext::hash_map<int32, SaveItem*> SavedItemMap;
+ typedef base::hash_map<int32, SaveItem*> SavedItemMap;
// saved_success_items_ is map of all saving job which are successfully saved.
SavedItemMap saved_success_items_;
@@ -292,11 +291,11 @@ class SavePackage : public base::RefCountedThreadSafe<SavePackage> {
// Number of all need to be saved resources.
int all_save_items_count_;
- typedef stdext::hash_set<std::wstring> FileNameSet;
+ typedef base::hash_set<std::wstring> FileNameSet;
// This set is used to eliminate duplicated file names in saving directory.
FileNameSet file_name_set_;
- typedef stdext::hash_map<std::wstring, uint32> FileNameCountMap;
+ typedef base::hash_map<std::wstring, uint32> FileNameCountMap;
// This map is used to track serial number for specified filename.
FileNameCountMap file_name_count_map_;
@@ -308,4 +307,3 @@ class SavePackage : public base::RefCountedThreadSafe<SavePackage> {
};
#endif // CHROME_BROWSER_SAVE_PACKAGE_H__
-
diff --git a/chrome/browser/web_contents.h b/chrome/browser/web_contents.h
index 43ba2e8..054c57e 100644
--- a/chrome/browser/web_contents.h
+++ b/chrome/browser/web_contents.h
@@ -5,8 +5,7 @@
#ifndef CHROME_BROWSER_WEB_CONTENTS_H_
#define CHROME_BROWSER_WEB_CONTENTS_H_
-#include <hash_map>
-
+#include "base/hash_tables.h"
#include "chrome/browser/fav_icon_helper.h"
#include "chrome/browser/printing/print_view_manager.h"
#include "chrome/browser/render_view_host_delegate.h"
@@ -749,10 +748,10 @@ class WebContents : public TabContents,
// These maps hold on to the pages/widgets that we created on behalf of the
// renderer that haven't shown yet.
- typedef stdext::hash_map<int, WebContents*> PendingViews;
+ typedef base::hash_map<int, WebContents*> PendingViews;
PendingViews pending_views_;
- typedef stdext::hash_map<int, RenderWidgetHost*> PendingWidgets;
+ typedef base::hash_map<int, RenderWidgetHost*> PendingWidgets;
PendingWidgets pending_widgets_;
// Non-null if we're displaying content for a web app.
@@ -765,4 +764,3 @@ class WebContents : public TabContents,
};
#endif // CHROME_BROWSER_WEB_CONTENTS_H_
-
diff --git a/chrome/browser/webdata/web_database.h b/chrome/browser/webdata/web_database.h
index c2ad550..176e70f 100644
--- a/chrome/browser/webdata/web_database.h
+++ b/chrome/browser/webdata/web_database.h
@@ -7,7 +7,6 @@
#include <string>
#include <vector>
-#include <hash_map>
#include "base/basictypes.h"
#include "chrome/browser/meta_table_helper.h"
@@ -142,4 +141,3 @@ class WebDatabase {
};
#endif // CHROME_BROWSER_WEBDATA_WEB_DATABASE_H__
-
generated by cgit v1.1 at 2025-01-29 13:31:39 +0000