chrome/browser/sync_file_system/sync_file_system_service_factory.cc - Issue 62883005: Implement SyncEngine::UpdateRegisteredApps()

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/sync_file_system_service_factory.cc

Issue 62883005: Implement SyncEngine::UpdateRegisteredApps() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fixed Created 7 years, 1 month 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 | Annotate | Revision Log

« no previous file with comments | « chrome/browser/sync_file_system/drive_backend/sync_engine_unittest.cc ('k') | no next file » | no next file with comments »

OLD	NEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.	1 // Copyright (c) 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/sync_file_system_service_factory.h"	5 #include "chrome/browser/sync_file_system/sync_file_system_service_factory.h"

6	6

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

8 #include "base/threading/sequenced_worker_pool.h"	8 #include "base/threading/sequenced_worker_pool.h"

9 #include "chrome/browser/drive/drive_api_service.h"	9 #include "chrome/browser/drive/drive_api_service.h"

10 #include "chrome/browser/drive/drive_notification_manager_factory.h"	10 #include "chrome/browser/drive/drive_notification_manager_factory.h"

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

11 #include "chrome/browser/extensions/extension_system_factory.h"	12 #include "chrome/browser/extensions/extension_system_factory.h"

12 #include "chrome/browser/google_apis/drive_api_url_generator.h"	13 #include "chrome/browser/google_apis/drive_api_url_generator.h"

13 #include "chrome/browser/google_apis/gdata_wapi_url_generator.h"	14 #include "chrome/browser/google_apis/gdata_wapi_url_generator.h"

14 #include "chrome/browser/profiles/profile.h"	15 #include "chrome/browser/profiles/profile.h"

15 #include "chrome/browser/signin/profile_oauth2_token_service.h"	16 #include "chrome/browser/signin/profile_oauth2_token_service.h"

16 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"	17 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"

17 #include "chrome/browser/sync/profile_sync_service.h"	18 #include "chrome/browser/sync/profile_sync_service.h"

18 #include "chrome/browser/sync_file_system/drive_backend/sync_engine.h"	19 #include "chrome/browser/sync_file_system/drive_backend/sync_engine.h"

19 #include "chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_servi ce.h"	20 #include "chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_servi ce.h"

20 #include "chrome/browser/sync_file_system/sync_file_system_service.h"	21 #include "chrome/browser/sync_file_system/sync_file_system_service.h"

(...skipping 101 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
122 remote_file_service->SetConflictResolutionPolicy(	123 remote_file_service->SetConflictResolutionPolicy(

123 CONFLICT_RESOLUTION_POLICY_MANUAL);	124 CONFLICT_RESOLUTION_POLICY_MANUAL);

124 }	125 }

125	126

126 service->Initialize(local_file_service.Pass(),	127 service->Initialize(local_file_service.Pass(),

127 remote_file_service.Pass());	128 remote_file_service.Pass());

128 return service;	129 return service;

129 }	130 }

130	131

131 } // namespace sync_file_system	132 } // namespace sync_file_system

OLD	NEW