Index: content/browser/dom_storage/session_storage_database_adapter.h |
diff --git a/webkit/browser/dom_storage/session_storage_database_adapter.h b/content/browser/dom_storage/session_storage_database_adapter.h |
similarity index 57% |
rename from webkit/browser/dom_storage/session_storage_database_adapter.h |
rename to content/browser/dom_storage/session_storage_database_adapter.h |
index 96b7b3e0054d73083fe6093d63314f4bef2333ac..18676fe82120d63008a959d3dc4953cdc8197272 100644 |
--- a/webkit/browser/dom_storage/session_storage_database_adapter.h |
+++ b/content/browser/dom_storage/session_storage_database_adapter.h |
@@ -2,26 +2,26 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef WEBKIT_BROWSER_DOM_STORAGE_SESSION_STORAGE_DATABASE_ADAPTER_H_ |
-#define WEBKIT_BROWSER_DOM_STORAGE_SESSION_STORAGE_DATABASE_ADAPTER_H_ |
+#ifndef CONTENT_BROWSER_DOM_STORAGE_SESSION_STORAGE_DATABASE_ADAPTER_H_ |
+#define CONTENT_BROWSER_DOM_STORAGE_SESSION_STORAGE_DATABASE_ADAPTER_H_ |
#include "base/memory/ref_counted.h" |
+#include "content/browser/dom_storage/dom_storage_database_adapter.h" |
#include "url/gurl.h" |
-#include "webkit/browser/dom_storage/dom_storage_database_adapter.h" |
-namespace dom_storage { |
+namespace content { |
class SessionStorageDatabase; |
-class SessionStorageDatabaseAdapter : public DomStorageDatabaseAdapter { |
+class SessionStorageDatabaseAdapter : public DOMStorageDatabaseAdapter { |
public: |
SessionStorageDatabaseAdapter(SessionStorageDatabase* db, |
const std::string& permanent_namespace_id, |
const GURL& origin); |
virtual ~SessionStorageDatabaseAdapter(); |
- virtual void ReadAllValues(ValuesMap* result) OVERRIDE; |
+ virtual void ReadAllValues(DOMStorageValuesMap* result) OVERRIDE; |
virtual bool CommitChanges(bool clear_all_first, |
- const ValuesMap& changes) OVERRIDE; |
+ const DOMStorageValuesMap& changes) OVERRIDE; |
private: |
scoped_refptr<SessionStorageDatabase> db_; |
std::string permanent_namespace_id_; |
@@ -30,6 +30,6 @@ class SessionStorageDatabaseAdapter : public DomStorageDatabaseAdapter { |
DISALLOW_COPY_AND_ASSIGN(SessionStorageDatabaseAdapter); |
}; |
-} // namespace dom_storage |
+} // namespace content |
-#endif // WEBKIT_BROWSER_DOM_STORAGE_SESSION_STORAGE_DATABASE_ADAPTER_H_ |
+#endif // CONTENT_BROWSER_DOM_STORAGE_SESSION_STORAGE_DATABASE_ADAPTER_H_ |