Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5285)

Unified Diff: chrome/browser/sync_file_system/drive_backend/conflict_resolver.cc

Issue 213473008: [SyncFS] Split SyncEngine and SyncEngineContext (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync_file_system/drive_backend/conflict_resolver.cc
diff --git a/chrome/browser/sync_file_system/drive_backend/conflict_resolver.cc b/chrome/browser/sync_file_system/drive_backend/conflict_resolver.cc
index 726520f7bef0f33a43775de8019f6cd84cec816c..a8857726e142dd83ffe66196cd50e1103dcc1585 100644
--- a/chrome/browser/sync_file_system/drive_backend/conflict_resolver.cc
+++ b/chrome/browser/sync_file_system/drive_backend/conflict_resolver.cc
@@ -23,11 +23,9 @@ namespace drive_backend {
ConflictResolver::ConflictResolver(SyncEngineContext* sync_context)
: sync_context_(sync_context),
- weak_ptr_factory_(this) {
-}
+ weak_ptr_factory_(this) {}
-ConflictResolver::~ConflictResolver() {
-}
+ConflictResolver::~ConflictResolver() {}
void ConflictResolver::RunSequential(const SyncStatusCallback& callback) {
if (!IsContextReady()) {
« no previous file with comments | « no previous file | chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698