chrome/browser/ui/webui/cookies_tree_model_util.cc - Issue 442383002: Move storage-related files from webkit/ to new top-level directory storage/

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/webui/cookies_tree_model_util.cc

Issue 442383002: Move storage-related files from webkit/ to new top-level directory storage/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: . Created 6 years, 4 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 | « chrome/browser/sync_file_system/syncable_file_system_util_unittest.cc ('k') | chrome/browser/ui/webui/options/cookies_view_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/cookies_tree_model_util.cc

diff --git a/chrome/browser/ui/webui/cookies_tree_model_util.cc b/chrome/browser/ui/webui/cookies_tree_model_util.cc

index 6ee0e4a55b3a1feba2421376452ac711131014cc..78711aca3f48a3dd67c3340e9842d77572b1937b 100644

--- a/chrome/browser/ui/webui/cookies_tree_model_util.cc

+++ b/chrome/browser/ui/webui/cookies_tree_model_util.cc

@@ -21,7 +21,7 @@

#include "net/ssl/ssl_client_cert_type.h"

#include "ui/base/l10n/l10n_util.h"

#include "ui/base/text/bytes_formatting.h"

-#include "webkit/common/fileapi/file_system_types.h"

+#include "storage/common/fileapi/file_system_types.h"

#if defined(ENABLE_EXTENSIONS)

#include "extensions/common/extension_set.h"

@@ -208,8 +208,8 @@ bool CookiesTreeModelUtil::GetCookieTreeNodeDictionary(

const BrowsingDataFileSystemHelper::FileSystemInfo& file_system_info =

*node.GetDetailedInfo().file_system_info;

- const fileapi::FileSystemType kPerm = fileapi::kFileSystemTypePersistent;

- const fileapi::FileSystemType kTemp = fileapi::kFileSystemTypeTemporary;

+ const storage::FileSystemType kPerm = storage::kFileSystemTypePersistent;

+ const storage::FileSystemType kTemp = storage::kFileSystemTypeTemporary;

dict->SetString(kKeyOrigin, file_system_info.origin.spec());

dict->SetString(kKeyPersistent,