chrome/browser/sync_file_system/drive_backend/conflict_resolver.cc - Issue 213473008: [SyncFS] Split SyncEngine and SyncEngineContext

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side 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: Fix tests 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 unified diff | Download patch

« no previous file with comments | « no previous file | chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc » ('j') | chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 #include "chrome/browser/sync_file_system/drive_backend/conflict_resolver.h"	5 #include "chrome/browser/sync_file_system/drive_backend/conflict_resolver.h"

6	6

7 #include "base/callback.h"	7 #include "base/callback.h"

8 #include "base/format_macros.h"	8 #include "base/format_macros.h"

9 #include "base/location.h"	9 #include "base/location.h"

10 #include "base/logging.h"	10 #include "base/logging.h"

	11 #include "base/sequenced_task_runner.h"
	tzik 2014/03/27 11:24:17 I think all #include additions are not needed. I think all #include additions are not needed. peria 2014/03/28 03:20:23 Done. Show quoted text On 2014/03/27 11:24:17, tzik wrote: > I think all #include additions are not needed. Done.
11 #include "chrome/browser/drive/drive_api_util.h"	12 #include "chrome/browser/drive/drive_api_util.h"

12 #include "chrome/browser/drive/drive_service_interface.h"	13 #include "chrome/browser/drive/drive_service_interface.h"

13 #include "chrome/browser/drive/drive_uploader.h"	14 #include "chrome/browser/drive/drive_uploader.h"

14 #include "chrome/browser/sync_file_system/drive_backend/drive_backend_util.h"	15 #include "chrome/browser/sync_file_system/drive_backend/drive_backend_util.h"

15 #include "chrome/browser/sync_file_system/drive_backend/metadata_database.h"	16 #include "chrome/browser/sync_file_system/drive_backend/metadata_database.h"

16 #include "chrome/browser/sync_file_system/drive_backend/metadata_database.pb.h"	17 #include "chrome/browser/sync_file_system/drive_backend/metadata_database.pb.h"

17 #include "chrome/browser/sync_file_system/drive_backend/sync_engine_context.h"	18 #include "chrome/browser/sync_file_system/drive_backend/sync_engine_context.h"

18 #include "chrome/browser/sync_file_system/logger.h"	19 #include "chrome/browser/sync_file_system/logger.h"

19 #include "google_apis/drive/drive_api_parser.h"	20 #include "google_apis/drive/drive_api_parser.h"

20	21

(...skipping 285 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
306 set_used_network(true);	307 set_used_network(true);

307 return sync_context_->GetDriveService();	308 return sync_context_->GetDriveService();

308 }	309 }

309	310

310 MetadataDatabase* ConflictResolver::metadata_database() {	311 MetadataDatabase* ConflictResolver::metadata_database() {

311 return sync_context_->GetMetadataDatabase();	312 return sync_context_->GetMetadataDatabase();

312 }	313 }

313	314

314 } // namespace drive_backend	315 } // namespace drive_backend

315 } // namespace sync_file_system	316 } // namespace sync_file_system

OLD	NEW