From 96f139b81e8d561eceb896d72578fdfef6d0fa8e Mon Sep 17 00:00:00 2001 From: "pkasting@chromium.org" Date: Thu, 15 Oct 2009 17:20:59 +0000 Subject: Oops, dom_storage_dispatcher_host.h got left out of the change, and I introduced a typo when converting CreateWebStorageNamespaceIfNecessary to use a conditional. BUG=23400 TEST=none TBR=jorlow Review URL: http://codereview.chromium.org/282005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29131 0039d316-1c4b-4281-b951-d872f2087c98 --- .../in_process_webkit/dom_storage_dispatcher_host.h | 14 -------------- chrome/browser/in_process_webkit/storage_namespace.cc | 2 +- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/chrome/browser/in_process_webkit/dom_storage_dispatcher_host.h b/chrome/browser/in_process_webkit/dom_storage_dispatcher_host.h index 89c0ea5..ad3206f 100644 --- a/chrome/browser/in_process_webkit/dom_storage_dispatcher_host.h +++ b/chrome/browser/in_process_webkit/dom_storage_dispatcher_host.h @@ -5,7 +5,6 @@ #ifndef CHROME_BROWSER_IN_PROCESS_WEBKIT_DOM_STORAGE_DISPATCHER_HOST_H_ #define CHROME_BROWSER_IN_PROCESS_WEBKIT_DOM_STORAGE_DISPATCHER_HOST_H_ -#include "base/hash_tables.h" #include "base/process.h" #include "base/ref_counted.h" #include "chrome/browser/in_process_webkit/storage_area.h" @@ -110,17 +109,4 @@ class DOMStorageDispatcherHost : DISALLOW_IMPLICIT_CONSTRUCTORS(DOMStorageDispatcherHost); }; -#if defined(COMPILER_GCC) -namespace __gnu_cxx { - -template<> -struct hash { - std::size_t operator()(DOMStorageDispatcherHost* const& p) const { - return reinterpret_cast(p); - } -}; - -} // namespace __gnu_cxx -#endif - #endif // CHROME_BROWSER_IN_PROCESS_WEBKIT_DOM_STORAGE_DISPATCHER_HOST_H_ diff --git a/chrome/browser/in_process_webkit/storage_namespace.cc b/chrome/browser/in_process_webkit/storage_namespace.cc index ce24700..0d15867 100644 --- a/chrome/browser/in_process_webkit/storage_namespace.cc +++ b/chrome/browser/in_process_webkit/storage_namespace.cc @@ -101,7 +101,7 @@ void StorageNamespace::CreateWebStorageNamespaceIfNecessary() { if (dom_storage_type_ == DOM_STORAGE_LOCAL) { storage_namespace_.reset( WebStorageNamespace::createLocalStorageNamespace(data_dir_path_, - kLocalStorageQuota); + kLocalStorageQuota)); } else { storage_namespace_.reset( WebStorageNamespace::createSessionStorageNamespace()); -- cgit v1.1