Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(316)

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

Issue 23787003: [SyncFS] Move SyncFS V1 files from drive_backend to drive_backend_v1 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: move back metadata_db_migration_util* Created 7 years, 3 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/chrome_browser.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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_system_factory.h" 11 #include "chrome/browser/extensions/extension_system_factory.h"
12 #include "chrome/browser/google_apis/drive_api_url_generator.h" 12 #include "chrome/browser/google_apis/drive_api_url_generator.h"
13 #include "chrome/browser/google_apis/gdata_wapi_url_generator.h" 13 #include "chrome/browser/google_apis/gdata_wapi_url_generator.h"
14 #include "chrome/browser/profiles/profile.h" 14 #include "chrome/browser/profiles/profile.h"
15 #include "chrome/browser/signin/profile_oauth2_token_service.h" 15 #include "chrome/browser/signin/profile_oauth2_token_service.h"
16 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" 16 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
17 #include "chrome/browser/sync/profile_sync_service.h" 17 #include "chrome/browser/sync/profile_sync_service.h"
18 #include "chrome/browser/sync_file_system/drive_backend/drive_file_sync_service. h"
19 #include "chrome/browser/sync_file_system/drive_backend/sync_engine.h" 18 #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/sync_file_system_service.h" 20 #include "chrome/browser/sync_file_system/sync_file_system_service.h"
21 #include "chrome/browser/sync_file_system/syncable_file_system_util.h" 21 #include "chrome/browser/sync_file_system/syncable_file_system_util.h"
22 #include "components/browser_context_keyed_service/browser_context_dependency_ma nager.h" 22 #include "components/browser_context_keyed_service/browser_context_dependency_ma nager.h"
23 23
24 namespace sync_file_system { 24 namespace sync_file_system {
25 25
26 namespace { 26 namespace {
27 const char kDisableLastWriteWin[] = "disable-syncfs-last-write-win"; 27 const char kDisableLastWriteWin[] = "disable-syncfs-last-write-win";
28 const char kEnableSyncFileSystemV2[] = "enable-syncfs-v2"; 28 const char kEnableSyncFileSystemV2[] = "enable-syncfs-v2";
29 } 29 }
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 remote_file_service->SetConflictResolutionPolicy( 123 remote_file_service->SetConflictResolutionPolicy(
124 CONFLICT_RESOLUTION_POLICY_MANUAL); 124 CONFLICT_RESOLUTION_POLICY_MANUAL);
125 } 125 }
126 126
127 service->Initialize(local_file_service.Pass(), 127 service->Initialize(local_file_service.Pass(),
128 remote_file_service.Pass()); 128 remote_file_service.Pass());
129 return service; 129 return service;
130 } 130 }
131 131
132 } // namespace sync_file_system 132 } // namespace sync_file_system
OLDNEW
« no previous file with comments | « chrome/browser/sync_file_system/sync_file_system_service.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698