OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/sync_file_system/drive_file_sync_service.h" | 5 #include "chrome/browser/sync_file_system/drive_file_sync_service.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <string> | 8 #include <string> |
9 #include <utility> | 9 #include <utility> |
10 | 10 |
(...skipping 18 matching lines...) Expand all Loading... |
29 #include "chrome/browser/sync_file_system/drive_metadata_store.h" | 29 #include "chrome/browser/sync_file_system/drive_metadata_store.h" |
30 #include "chrome/browser/sync_file_system/file_status_observer.h" | 30 #include "chrome/browser/sync_file_system/file_status_observer.h" |
31 #include "chrome/browser/sync_file_system/logger.h" | 31 #include "chrome/browser/sync_file_system/logger.h" |
32 #include "chrome/browser/sync_file_system/remote_change_handler.h" | 32 #include "chrome/browser/sync_file_system/remote_change_handler.h" |
33 #include "chrome/browser/sync_file_system/remote_change_processor.h" | 33 #include "chrome/browser/sync_file_system/remote_change_processor.h" |
34 #include "chrome/browser/sync_file_system/remote_sync_operation_resolver.h" | 34 #include "chrome/browser/sync_file_system/remote_sync_operation_resolver.h" |
35 #include "chrome/browser/sync_file_system/sync_file_system.pb.h" | 35 #include "chrome/browser/sync_file_system/sync_file_system.pb.h" |
36 #include "chrome/common/extensions/extension.h" | 36 #include "chrome/common/extensions/extension.h" |
37 #include "content/public/browser/browser_thread.h" | 37 #include "content/public/browser/browser_thread.h" |
38 #include "extensions/common/constants.h" | 38 #include "extensions/common/constants.h" |
39 #include "webkit/blob/scoped_file.h" | |
40 #include "webkit/browser/fileapi/file_system_url.h" | 39 #include "webkit/browser/fileapi/file_system_url.h" |
41 #include "webkit/browser/fileapi/syncable/sync_file_metadata.h" | 40 #include "webkit/browser/fileapi/syncable/sync_file_metadata.h" |
42 #include "webkit/browser/fileapi/syncable/sync_file_type.h" | 41 #include "webkit/browser/fileapi/syncable/sync_file_type.h" |
43 #include "webkit/browser/fileapi/syncable/syncable_file_system_util.h" | 42 #include "webkit/browser/fileapi/syncable/syncable_file_system_util.h" |
| 43 #include "webkit/common/blob/scoped_file.h" |
44 #include "webkit/common/fileapi/file_system_util.h" | 44 #include "webkit/common/fileapi/file_system_util.h" |
45 | 45 |
46 using fileapi::FileSystemURL; | 46 using fileapi::FileSystemURL; |
47 | 47 |
48 namespace sync_file_system { | 48 namespace sync_file_system { |
49 | 49 |
50 typedef DriveFileSyncService::ConflictResolutionResult ConflictResolutionResult; | 50 typedef DriveFileSyncService::ConflictResolutionResult ConflictResolutionResult; |
51 | 51 |
52 namespace { | 52 namespace { |
53 | 53 |
(...skipping 1680 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1734 metadata_store_->SetOriginRootDirectory(origin, resource_id); | 1734 metadata_store_->SetOriginRootDirectory(origin, resource_id); |
1735 } | 1735 } |
1736 callback.Run(status, resource_id); | 1736 callback.Run(status, resource_id); |
1737 } | 1737 } |
1738 | 1738 |
1739 std::string DriveFileSyncService::sync_root_resource_id() { | 1739 std::string DriveFileSyncService::sync_root_resource_id() { |
1740 return metadata_store_->sync_root_directory(); | 1740 return metadata_store_->sync_root_directory(); |
1741 } | 1741 } |
1742 | 1742 |
1743 } // namespace sync_file_system | 1743 } // namespace sync_file_system |
OLD | NEW |