Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(53)

Unified Diff: chrome/browser/in_process_webkit/dom_storage_context.cc

Issue 6173008: Clean up some old TODOs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/renderer/renderer_webidbcursor_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/in_process_webkit/dom_storage_context.cc
diff --git a/chrome/browser/in_process_webkit/dom_storage_context.cc b/chrome/browser/in_process_webkit/dom_storage_context.cc
index 1d6d627a453404685c59cac1dee41fa03c38231c..7dfc4a701fb50e1b185ddf0a8144f3ec220c8e53 100644
--- a/chrome/browser/in_process_webkit/dom_storage_context.cc
+++ b/chrome/browser/in_process_webkit/dom_storage_context.cc
@@ -49,20 +49,6 @@ const FilePath::CharType DOMStorageContext::kLocalStorageDirectory[] =
const FilePath::CharType DOMStorageContext::kLocalStorageExtension[] =
FILE_PATH_LITERAL(".localstorage");
-static const FilePath::CharType kLocalStorageOldPath[] =
- FILE_PATH_LITERAL("localStorage");
-
-// TODO(jorlow): Remove after Chrome 4 ships.
-static void MigrateLocalStorageDirectory(const FilePath& data_path) {
- FilePath new_path = data_path.Append(
- DOMStorageContext::kLocalStorageDirectory);
- FilePath old_path = data_path.Append(kLocalStorageOldPath);
- if (!file_util::DirectoryExists(new_path) &&
- file_util::DirectoryExists(old_path)) {
- file_util::Move(old_path, new_path);
- }
-}
-
DOMStorageContext::DOMStorageContext(WebKitContext* webkit_context)
: last_storage_area_id_(0),
last_session_storage_namespace_id_on_ui_thread_(kLocalStorageNamespaceId),
@@ -258,10 +244,8 @@ void DOMStorageContext::DeleteAllLocalStorageFiles() {
DOMStorageNamespace* DOMStorageContext::CreateLocalStorage() {
FilePath dir_path;
- if (!data_path_.empty()) {
- MigrateLocalStorageDirectory(data_path_);
+ if (!data_path_.empty())
dir_path = data_path_.Append(kLocalStorageDirectory);
- }
DOMStorageNamespace* new_namespace =
DOMStorageNamespace::CreateLocalStorageNamespace(this, dir_path);
RegisterStorageNamespace(new_namespace);
« no previous file with comments | « no previous file | chrome/renderer/renderer_webidbcursor_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698