OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 #ifndef CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_CONFLICT_RESOLVER_H_ | 5 #ifndef CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_CONFLICT_RESOLVER_H_ |
6 #define CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_CONFLICT_RESOLVER_H_ | 6 #define CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_CONFLICT_RESOLVER_H_ |
7 | 7 |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
11 #include "base/memory/scoped_ptr.h" | 11 #include "base/memory/scoped_ptr.h" |
12 #include "base/memory/weak_ptr.h" | 12 #include "base/memory/weak_ptr.h" |
13 #include "chrome/browser/google_apis/gdata_errorcode.h" | |
14 #include "chrome/browser/sync_file_system/sync_callbacks.h" | 13 #include "chrome/browser/sync_file_system/sync_callbacks.h" |
15 #include "chrome/browser/sync_file_system/sync_task.h" | 14 #include "chrome/browser/sync_file_system/sync_task.h" |
| 15 #include "google_apis/drive/gdata_errorcode.h" |
16 | 16 |
17 namespace drive { | 17 namespace drive { |
18 class DriveServiceInterface; | 18 class DriveServiceInterface; |
19 } | 19 } |
20 | 20 |
21 namespace google_apis { | 21 namespace google_apis { |
22 class ResourceEntry; | 22 class ResourceEntry; |
23 } | 23 } |
24 | 24 |
25 namespace sync_file_system { | 25 namespace sync_file_system { |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
69 | 69 |
70 base::WeakPtrFactory<ConflictResolver> weak_ptr_factory_; | 70 base::WeakPtrFactory<ConflictResolver> weak_ptr_factory_; |
71 | 71 |
72 DISALLOW_COPY_AND_ASSIGN(ConflictResolver); | 72 DISALLOW_COPY_AND_ASSIGN(ConflictResolver); |
73 }; | 73 }; |
74 | 74 |
75 } // namespace drive_backend | 75 } // namespace drive_backend |
76 } // namespace sync_file_system | 76 } // namespace sync_file_system |
77 | 77 |
78 #endif // CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_CONFLICT_RESOLVER_H_ | 78 #endif // CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_CONFLICT_RESOLVER_H_ |
OLD | NEW |