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

Unified Diff: chrome/browser/sync_file_system/drive_backend/local_sync_operation_resolver.h

Issue 23787003: [SyncFS] Move SyncFS V1 files from drive_backend to drive_backend_v1 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: move back metadata_db_migration_util* Created 7 years, 3 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
Index: chrome/browser/sync_file_system/drive_backend/local_sync_operation_resolver.h
diff --git a/chrome/browser/sync_file_system/drive_backend/local_sync_operation_resolver.h b/chrome/browser/sync_file_system/drive_backend/local_sync_operation_resolver.h
deleted file mode 100644
index cdba7e8b816e09b272d75a5c975b1781ad7af4ef..0000000000000000000000000000000000000000
--- a/chrome/browser/sync_file_system/drive_backend/local_sync_operation_resolver.h
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_LOCAL_SYNC_OPERATION_RESOLVER_H_
-#define CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_LOCAL_SYNC_OPERATION_RESOLVER_H_
-
-#include "base/gtest_prod_util.h"
-#include "chrome/browser/sync_file_system/file_change.h"
-#include "chrome/browser/sync_file_system/sync_file_type.h"
-#include "chrome/browser/sync_file_system/sync_operation_type.h"
-
-namespace sync_file_system {
-
-class DriveMetadata;
-class FileChange;
-
-class LocalSyncOperationResolver {
- public:
- // |remote_file_change| is non-null when we have a remote change for the file,
- // and |drive_metadata| is also non-null when we have metadata.
- static SyncOperationType Resolve(
- const FileChange& local_file_change,
- const FileChange* remote_file_change,
- const DriveMetadata* drive_metadata);
-
- private:
- static SyncOperationType ResolveForAddOrUpdateFile(
- const FileChange* remote_file_change,
- SyncFileType remote_file_type_in_metadata);
- static SyncOperationType ResolveForAddOrUpdateFileInConflict(
- const FileChange* remote_file_change);
- static SyncOperationType ResolveForAddDirectory(
- const FileChange* remote_file_change,
- SyncFileType remote_file_type_in_metadata);
- static SyncOperationType ResolveForAddDirectoryInConflict();
- static SyncOperationType ResolveForDelete(
- const FileChange* remote_file_change,
- SyncFileType remote_file_type_in_metadata);
- static SyncOperationType ResolveForDeleteInConflict(
- const FileChange* remote_file_change);
-
- FRIEND_TEST_ALL_PREFIXES(LocalSyncOperationResolverTest,
- ResolveForAddOrUpdateFile);
- FRIEND_TEST_ALL_PREFIXES(LocalSyncOperationResolverTest,
- ResolveForAddOrUpdateFileInConflict);
- FRIEND_TEST_ALL_PREFIXES(LocalSyncOperationResolverTest,
- ResolveForAddDirectory);
- FRIEND_TEST_ALL_PREFIXES(LocalSyncOperationResolverTest,
- ResolveForAddDirectoryInConflict);
- FRIEND_TEST_ALL_PREFIXES(LocalSyncOperationResolverTest,
- ResolveForDelete);
- FRIEND_TEST_ALL_PREFIXES(LocalSyncOperationResolverTest,
- ResolveForDeleteInConflict);
-};
-
-} // namespace sync_file_system
-
-#endif // CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_LOCAL_SYNC_OPERATION_RESOLVER_H_

Powered by Google App Engine
This is Rietveld 408576698