chrome/browser/sync_file_system/drive_backend_v1/remote_sync_delegate.h - 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/remote_sync_delegate.h

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/remote_change_handler.cc ('k') | chrome/browser/sync_file_system/drive_backend_v1/remote_sync_delegate.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/remote_sync_delegate.h

diff --git a/chrome/browser/sync_file_system/drive_backend_v1/remote_sync_delegate.h b/chrome/browser/sync_file_system/drive_backend_v1/remote_sync_delegate.h

index 51f4e3bb02c33f71faf6b67f8878846f56f52e9d..158ab49954c62e706ee6cd47fa23540ed57ba4f4 100644

--- a/chrome/browser/sync_file_system/drive_backend_v1/remote_sync_delegate.h

+++ b/chrome/browser/sync_file_system/drive_backend_v1/remote_sync_delegate.h

@@ -17,8 +17,8 @@

#include "chrome/browser/sync_file_system/sync_callbacks.h"

#include "chrome/browser/sync_file_system/sync_file_metadata.h"

#include "chrome/browser/sync_file_system/sync_file_system.pb.h"

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

-#include "webkit/common/blob/scoped_file.h"

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

+#include "storage/common/blob/scoped_file.h"

namespace sync_file_system {

@@ -44,7 +44,7 @@ class RemoteSyncDelegate : public base::SupportsWeakPtr<RemoteSyncDelegate> {

void Run(const SyncStatusCallback& callback);

- const fileapi::FileSystemURL& url() const { return remote_change_.url; }

+ const storage::FileSystemURL& url() const { return remote_change_.url; }

private:

void DidPrepareForProcessRemoteChange(const SyncStatusCallback& callback,

@@ -61,7 +61,7 @@ class RemoteSyncDelegate : public base::SupportsWeakPtr<RemoteSyncDelegate> {

const std::string& md5_checksum,

int64 file_size,

const base::Time& updated_time,

- webkit_blob::ScopedFile downloaded_file);

+ storage::ScopedFile downloaded_file);

void HandleConflict(const SyncStatusCallback& callback,

SyncFileType remote_file_type);

void HandleLocalWin(const SyncStatusCallback& callback);

@@ -106,7 +106,7 @@ class RemoteSyncDelegate : public base::SupportsWeakPtr<RemoteSyncDelegate> {

RemoteChange remote_change_;

DriveMetadata drive_metadata_;

SyncFileMetadata local_metadata_;

- webkit_blob::ScopedFile temporary_file_;

+ storage::ScopedFile temporary_file_;

std::string md5_checksum_;

SyncAction sync_action_;

bool metadata_updated_;