chrome/browser/sync_file_system/drive_backend/conflict_resolver.cc - Issue 1190203002: Move (most of) chrome/browser/drive into components/drive/service.

Side by Side Diff: chrome/browser/sync_file_system/drive_backend/conflict_resolver.cc

Issue 1190203002: Move (most of) chrome/browser/drive into components/drive/service. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebasing... Created 5 years, 5 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

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/strings/stringprintf.h"	11 #include "base/strings/stringprintf.h"

12 #include "chrome/browser/drive/drive_api_util.h"

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

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

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

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

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

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

19 #include "chrome/browser/sync_file_system/drive_backend/sync_task_manager.h"	16 #include "chrome/browser/sync_file_system/drive_backend/sync_task_manager.h"

20 #include "chrome/browser/sync_file_system/drive_backend/sync_task_token.h"	17 #include "chrome/browser/sync_file_system/drive_backend/sync_task_token.h"

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

	19 #include "components/drive/drive_api_util.h"

	20 #include "components/drive/drive_uploader.h"

	21 #include "components/drive/service/drive_service_interface.h"

22 #include "google_apis/drive/drive_api_parser.h"	22 #include "google_apis/drive/drive_api_parser.h"

23	23

24 namespace sync_file_system {	24 namespace sync_file_system {

25 namespace drive_backend {	25 namespace drive_backend {

26	26

27 ConflictResolver::ConflictResolver(SyncEngineContext* sync_context)	27 ConflictResolver::ConflictResolver(SyncEngineContext* sync_context)

28 : sync_context_(sync_context),	28 : sync_context_(sync_context),

29 weak_ptr_factory_(this) {}	29 weak_ptr_factory_(this) {}

30	30

31 ConflictResolver::~ConflictResolver() {}	31 ConflictResolver::~ConflictResolver() {}

(...skipping 287 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
319 set_used_network(true);	319 set_used_network(true);

320 return sync_context_->GetDriveService();	320 return sync_context_->GetDriveService();

321 }	321 }

322	322

323 MetadataDatabase* ConflictResolver::metadata_database() {	323 MetadataDatabase* ConflictResolver::metadata_database() {

324 return sync_context_->GetMetadataDatabase();	324 return sync_context_->GetMetadataDatabase();

325 }	325 }

326	326

327 } // namespace drive_backend	327 } // namespace drive_backend

328 } // namespace sync_file_system	328 } // namespace sync_file_system

OLD	NEW