summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sync_file_system/drive_backend/conflict_resolver.h
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/sync_file_system/drive_backend/conflict_resolver.h')
-rw-r--r--chrome/browser/sync_file_system/drive_backend/conflict_resolver.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/chrome/browser/sync_file_system/drive_backend/conflict_resolver.h b/chrome/browser/sync_file_system/drive_backend/conflict_resolver.h
index e0cfef7..ae2e1f5 100644
--- a/chrome/browser/sync_file_system/drive_backend/conflict_resolver.h
+++ b/chrome/browser/sync_file_system/drive_backend/conflict_resolver.h
@@ -9,6 +9,7 @@
#include <utility>
#include <vector>
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "chrome/browser/sync_file_system/drive_backend/sync_task.h"