diff options
| author | hashimoto@chromium.org <hashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-23 04:36:34 +0000 |
|---|---|---|
| committer | hashimoto@chromium.org <hashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-23 04:36:34 +0000 |
| commit | bb0e79474b4a2a50643901aae666a9e67ae9da8d (patch) | |
| tree | e28e0c8988f303e44024df880d8735ac4a895e87 /webkit/dom_storage | |
| parent | a0100c9d99acc92d6801f8d113873898e004e4d9 (diff) | |
| download | chromium_src-bb0e79474b4a2a50643901aae666a9e67ae9da8d.zip chromium_src-bb0e79474b4a2a50643901aae666a9e67ae9da8d.tar.gz chromium_src-bb0e79474b4a2a50643901aae666a9e67ae9da8d.tar.bz2 | |
webkit: Move FilePath/WebString conversion functions from 'glue' to 'base'
Add new files file_path_string_conversions.h/cc.
'dom_storage' no longer depends on 'glue'
Function declarations of RemoveForDataFromHistoryState(), RemovePasswordDataFromHistoryState(), RemoveScrollOffsetFromHistoryState(), CreateHistoryStateForURL() are moved from webkit_glue.h to glue_serialize.h. (This move is needed to export these functions without including webkit_glue.h from glue_serialize.cc)
BUG=157095
TEST=build
Review URL: https://chromiumcodereview.appspot.com/11232035
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163505 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/dom_storage')
| -rw-r--r-- | webkit/dom_storage/dom_storage_area.cc | 4 | ||||
| -rw-r--r-- | webkit/dom_storage/webkit_dom_storage.gypi | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/webkit/dom_storage/dom_storage_area.cc b/webkit/dom_storage/dom_storage_area.cc index 74635b7..c72b107 100644 --- a/webkit/dom_storage/dom_storage_area.cc +++ b/webkit/dom_storage/dom_storage_area.cc @@ -9,6 +9,7 @@ #include "base/logging.h" #include "base/time.h" #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" +#include "webkit/base/file_path_string_conversions.h" #include "webkit/database/database_util.h" #include "webkit/dom_storage/dom_storage_map.h" #include "webkit/dom_storage/dom_storage_namespace.h" @@ -18,7 +19,6 @@ #include "webkit/dom_storage/session_storage_database.h" #include "webkit/dom_storage/session_storage_database_adapter.h" #include "webkit/fileapi/file_system_util.h" -#include "webkit/glue/webkit_glue.h" using webkit_database::DatabaseUtil; @@ -50,7 +50,7 @@ FilePath DomStorageArea::DatabaseFileNameFromOrigin(const GURL& origin) { // static GURL DomStorageArea::OriginFromDatabaseFileName(const FilePath& name) { DCHECK(name.MatchesExtension(kDatabaseFileExtension)); - WebKit::WebString origin_id = webkit_glue::FilePathToWebString( + WebKit::WebString origin_id = webkit_base::FilePathToWebString( name.BaseName().RemoveExtension()); return DatabaseUtil::GetOriginFromIdentifier(origin_id); } diff --git a/webkit/dom_storage/webkit_dom_storage.gypi b/webkit/dom_storage/webkit_dom_storage.gypi index 5ef65b9..40079fa 100644 --- a/webkit/dom_storage/webkit_dom_storage.gypi +++ b/webkit/dom_storage/webkit_dom_storage.gypi @@ -16,9 +16,9 @@ '<(DEPTH)/third_party/sqlite/sqlite.gyp:sqlite', '<(DEPTH)/webkit/support/webkit_support.gyp:database', '<(DEPTH)/webkit/support/webkit_support.gyp:quota', + '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_base', + '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_storage', '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', - 'glue', - 'webkit_storage', ], 'sources': [ 'dom_storage_area.cc', |