chrome/browser/sync_file_system/sync_file_system_service_factory.cc - Issue 15806012: Move webkit/fileapi/syncable/* code to webkit/browser/fileapi (final!)

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 15806012: Move webkit/fileapi/syncable/* code to webkit/browser/fileapi (final!) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: 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 | Annotate | Revision Log

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

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 "chrome/browser/google_apis/drive_notification_manager_factory.h"	8 #include "chrome/browser/google_apis/drive_notification_manager_factory.h"

9 #include "chrome/browser/profiles/profile.h"	9 #include "chrome/browser/profiles/profile.h"

10 #include "chrome/browser/sync/profile_sync_service.h"	10 #include "chrome/browser/sync/profile_sync_service.h"

11 #include "chrome/browser/sync_file_system/drive_file_sync_service.h"	11 #include "chrome/browser/sync_file_system/drive_file_sync_service.h"

12 #include "chrome/browser/sync_file_system/sync_file_system_service.h"	12 #include "chrome/browser/sync_file_system/sync_file_system_service.h"

13 #include "components/browser_context_keyed_service/browser_context_dependency_ma nager.h"	13 #include "components/browser_context_keyed_service/browser_context_dependency_ma nager.h"

14 #include "webkit/fileapi/syncable/syncable_file_system_util.h"	14 #include "webkit/browser/fileapi/syncable/syncable_file_system_util.h"

15	15

16 namespace sync_file_system {	16 namespace sync_file_system {

17	17

18 namespace {	18 namespace {

19 const char kDisableLastWriteWin[] = "disable-syncfs-last-write-win";	19 const char kDisableLastWriteWin[] = "disable-syncfs-last-write-win";

20 }	20 }

21	21

22 // static	22 // static

23 SyncFileSystemService* SyncFileSystemServiceFactory::GetForProfile(	23 SyncFileSystemService* SyncFileSystemServiceFactory::GetForProfile(

24 Profile* profile) {	24 Profile* profile) {

(...skipping 45 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
70 remote_file_service->SetConflictResolutionPolicy(	70 remote_file_service->SetConflictResolutionPolicy(

71 CONFLICT_RESOLUTION_MANUAL);	71 CONFLICT_RESOLUTION_MANUAL);

72 }	72 }

73	73

74 service->Initialize(local_file_service.Pass(),	74 service->Initialize(local_file_service.Pass(),

75 remote_file_service.Pass());	75 remote_file_service.Pass());

76 return service;	76 return service;

77 }	77 }

78	78

79 } // namespace sync_file_system	79 } // namespace sync_file_system

OLD	NEW