chrome/browser/sync_file_system/drive_backend_v1/drive_metadata_store.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/sync_file_system/drive_backend_v1/drive_metadata_store.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/drive_backend_v1/drive_metadata_store.h ('k') | chrome/browser/sync_file_system/drive_backend_v1/drive_metadata_store_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync_file_system/drive_backend_v1/drive_metadata_store.cc

diff --git a/chrome/browser/sync_file_system/drive_backend_v1/drive_metadata_store.cc b/chrome/browser/sync_file_system/drive_backend_v1/drive_metadata_store.cc

index 6800b0aa5f8c75ae6a25038b95196083a6ed698b..5c40c9e5dda91dea51c2a8ecec31ba2ae5f78e8b 100644

--- a/chrome/browser/sync_file_system/drive_backend_v1/drive_metadata_store.cc

+++ b/chrome/browser/sync_file_system/drive_backend_v1/drive_metadata_store.cc

@@ -27,10 +27,10 @@

#include "third_party/leveldatabase/src/include/leveldb/db.h"

#include "third_party/leveldatabase/src/include/leveldb/write_batch.h"

#include "url/gurl.h"

-#include "webkit/browser/fileapi/file_system_url.h"

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

+#include "storage/browser/fileapi/file_system_url.h"

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

-using fileapi::FileSystemURL;

+using storage::FileSystemURL;

namespace sync_file_system {

@@ -678,7 +678,7 @@ void DriveMetadataStore::UpdateDBStatusAndInvokeCallback(

}

SyncStatusCode DriveMetadataStore::GetConflictURLs(

- fileapi::FileSystemURLSet* urls) const {

+ storage::FileSystemURLSet* urls) const {

DCHECK(CalledOnValidThread());

DCHECK_EQ(SYNC_STATUS_OK, db_status_);