Index: sync/engine/resolve_conflicts_command.h |
diff --git a/chrome/browser/sync/engine/resolve_conflicts_command.h b/sync/engine/resolve_conflicts_command.h |
similarity index 74% |
rename from chrome/browser/sync/engine/resolve_conflicts_command.h |
rename to sync/engine/resolve_conflicts_command.h |
index 2121a319caa8e86f29e3a4f2ddb1a436c217736f..8c2c87e44f6c5402ee1a59284a5b7cc6dc5d7b99 100644 |
--- a/chrome/browser/sync/engine/resolve_conflicts_command.h |
+++ b/sync/engine/resolve_conflicts_command.h |
@@ -2,13 +2,13 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef CHROME_BROWSER_SYNC_ENGINE_RESOLVE_CONFLICTS_COMMAND_H_ |
-#define CHROME_BROWSER_SYNC_ENGINE_RESOLVE_CONFLICTS_COMMAND_H_ |
+#ifndef SYNC_ENGINE_RESOLVE_CONFLICTS_COMMAND_H_ |
+#define SYNC_ENGINE_RESOLVE_CONFLICTS_COMMAND_H_ |
#pragma once |
#include "base/basictypes.h" |
#include "base/compiler_specific.h" |
-#include "chrome/browser/sync/engine/model_changing_syncer_command.h" |
+#include "sync/engine/model_changing_syncer_command.h" |
namespace browser_sync { |
@@ -30,4 +30,4 @@ class ResolveConflictsCommand : public ModelChangingSyncerCommand { |
} // namespace browser_sync |
-#endif // CHROME_BROWSER_SYNC_ENGINE_RESOLVE_CONFLICTS_COMMAND_H_ |
+#endif // SYNC_ENGINE_RESOLVE_CONFLICTS_COMMAND_H_ |