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 <utility> | 9 #include <utility> |
10 #include <vector> | 10 #include <vector> |
11 | 11 |
| 12 #include "base/macros.h" |
12 #include "base/memory/scoped_ptr.h" | 13 #include "base/memory/scoped_ptr.h" |
13 #include "base/memory/weak_ptr.h" | 14 #include "base/memory/weak_ptr.h" |
14 #include "chrome/browser/sync_file_system/drive_backend/sync_task.h" | 15 #include "chrome/browser/sync_file_system/drive_backend/sync_task.h" |
15 #include "chrome/browser/sync_file_system/sync_callbacks.h" | 16 #include "chrome/browser/sync_file_system/sync_callbacks.h" |
16 #include "google_apis/drive/drive_api_error_codes.h" | 17 #include "google_apis/drive/drive_api_error_codes.h" |
17 | 18 |
18 namespace drive { | 19 namespace drive { |
19 class DriveServiceInterface; | 20 class DriveServiceInterface; |
20 } | 21 } |
21 | 22 |
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
79 | 80 |
80 base::WeakPtrFactory<ConflictResolver> weak_ptr_factory_; | 81 base::WeakPtrFactory<ConflictResolver> weak_ptr_factory_; |
81 | 82 |
82 DISALLOW_COPY_AND_ASSIGN(ConflictResolver); | 83 DISALLOW_COPY_AND_ASSIGN(ConflictResolver); |
83 }; | 84 }; |
84 | 85 |
85 } // namespace drive_backend | 86 } // namespace drive_backend |
86 } // namespace sync_file_system | 87 } // namespace sync_file_system |
87 | 88 |
88 #endif // CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_CONFLICT_RESOLVER_H_ | 89 #endif // CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_CONFLICT_RESOLVER_H_ |
OLD | NEW |