chrome/browser/sync_file_system/drive_file_sync_service.cc - Issue 15580002: Make use of InvalidationService

Side by Side Diff: chrome/browser/sync_file_system/drive_file_sync_service.cc

Issue 15580002: Make use of InvalidationService (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: First set of review fixes Created 7 years, 7 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 (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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_file_sync_service.h"	5 #include "chrome/browser/sync_file_system/drive_file_sync_service.h"

6	6

7 #include <algorithm>	7 #include <algorithm>

8 #include <string>	8 #include <string>

9 #include <utility>	9 #include <utility>

10	10

11 #include "base/bind.h"	11 #include "base/bind.h"

12 #include "base/file_util.h"	12 #include "base/file_util.h"

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

14 #include "base/memory/weak_ptr.h"	14 #include "base/memory/weak_ptr.h"

15 #include "base/message_loop/message_loop_proxy.h"	15 #include "base/message_loop/message_loop_proxy.h"

16 #include "base/utf_string_conversions.h"	16 #include "base/utf_string_conversions.h"

17 #include "base/values.h"	17 #include "base/values.h"

18 #include "chrome/browser/extensions/extension_service.h"	18 #include "chrome/browser/extensions/extension_service.h"

19 #include "chrome/browser/extensions/extension_system.h"	19 #include "chrome/browser/extensions/extension_system.h"

20 #include "chrome/browser/google_apis/drive_notification_manager.h"	20 #include "chrome/browser/google_apis/drive_notification_manager.h"

21 #include "chrome/browser/google_apis/drive_notification_manager_factory.h"	21 #include "chrome/browser/google_apis/drive_notification_manager_factory.h"

	22 #include "chrome/browser/invalidation/invalidation_service.h"

	23 #include "chrome/browser/invalidation/invalidation_service_factory.h"

22 #include "chrome/browser/profiles/profile.h"	24 #include "chrome/browser/profiles/profile.h"

23 #include "chrome/browser/sync_file_system/conflict_resolution_policy.h"	25 #include "chrome/browser/sync_file_system/conflict_resolution_policy.h"

24 #include "chrome/browser/sync_file_system/drive/api_util.h"	26 #include "chrome/browser/sync_file_system/drive/api_util.h"

25 #include "chrome/browser/sync_file_system/drive/local_change_processor_delegate. h"	27 #include "chrome/browser/sync_file_system/drive/local_change_processor_delegate. h"

26 #include "chrome/browser/sync_file_system/drive_file_sync_task_manager.h"	28 #include "chrome/browser/sync_file_system/drive_file_sync_task_manager.h"

27 #include "chrome/browser/sync_file_system/drive_file_sync_util.h"	29 #include "chrome/browser/sync_file_system/drive_file_sync_util.h"

28 #include "chrome/browser/sync_file_system/drive_metadata_store.h"	30 #include "chrome/browser/sync_file_system/drive_metadata_store.h"

29 #include "chrome/browser/sync_file_system/file_status_observer.h"	31 #include "chrome/browser/sync_file_system/file_status_observer.h"

30 #include "chrome/browser/sync_file_system/logger.h"	32 #include "chrome/browser/sync_file_system/logger.h"

31 #include "chrome/browser/sync_file_system/remote_change_handler.h"	33 #include "chrome/browser/sync_file_system/remote_change_handler.h"

(...skipping 1680 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1712 pending_batch_sync_origins_.insert(origin);	1714 pending_batch_sync_origins_.insert(origin);

1713 }	1715 }

1714 callback.Run(status, resource_id);	1716 callback.Run(status, resource_id);

1715 }	1717 }

1716	1718

1717 std::string DriveFileSyncService::sync_root_resource_id() {	1719 std::string DriveFileSyncService::sync_root_resource_id() {

1718 return metadata_store_->sync_root_directory();	1720 return metadata_store_->sync_root_directory();

1719 }	1721 }

1720	1722

1721 } // namespace sync_file_system	1723 } // namespace sync_file_system

OLD	NEW