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

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

Issue 14895013: Move webkit/fileapi/file_system_mount_point_provider.h to webkit/browser/fileapi (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
OLDNEW
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
(...skipping 15 matching lines...) Expand all
26 #include "chrome/browser/sync_file_system/drive_file_sync_util.h" 26 #include "chrome/browser/sync_file_system/drive_file_sync_util.h"
27 #include "chrome/browser/sync_file_system/drive_metadata_store.h" 27 #include "chrome/browser/sync_file_system/drive_metadata_store.h"
28 #include "chrome/browser/sync_file_system/file_status_observer.h" 28 #include "chrome/browser/sync_file_system/file_status_observer.h"
29 #include "chrome/browser/sync_file_system/remote_change_processor.h" 29 #include "chrome/browser/sync_file_system/remote_change_processor.h"
30 #include "chrome/browser/sync_file_system/remote_sync_operation_resolver.h" 30 #include "chrome/browser/sync_file_system/remote_sync_operation_resolver.h"
31 #include "chrome/browser/sync_file_system/sync_file_system.pb.h" 31 #include "chrome/browser/sync_file_system/sync_file_system.pb.h"
32 #include "chrome/common/extensions/extension.h" 32 #include "chrome/common/extensions/extension.h"
33 #include "content/public/browser/browser_thread.h" 33 #include "content/public/browser/browser_thread.h"
34 #include "extensions/common/constants.h" 34 #include "extensions/common/constants.h"
35 #include "webkit/blob/scoped_file.h" 35 #include "webkit/blob/scoped_file.h"
36 #include "webkit/browser/fileapi/syncable/sync_file_metadata.h"
37 #include "webkit/browser/fileapi/syncable/sync_file_type.h"
38 #include "webkit/browser/fileapi/syncable/syncable_file_system_util.h"
36 #include "webkit/fileapi/file_system_url.h" 39 #include "webkit/fileapi/file_system_url.h"
37 #include "webkit/fileapi/file_system_util.h" 40 #include "webkit/fileapi/file_system_util.h"
38 #include "webkit/fileapi/syncable/sync_file_metadata.h"
39 #include "webkit/fileapi/syncable/sync_file_type.h"
40 #include "webkit/fileapi/syncable/syncable_file_system_util.h"
41 41
42 using fileapi::FileSystemURL; 42 using fileapi::FileSystemURL;
43 43
44 namespace sync_file_system { 44 namespace sync_file_system {
45 45
46 namespace { 46 namespace {
47 47
48 const base::FilePath::CharType kTempDirName[] = FILE_PATH_LITERAL("tmp"); 48 const base::FilePath::CharType kTempDirName[] = FILE_PATH_LITERAL("tmp");
49 const base::FilePath::CharType kSyncFileSystemDir[] = 49 const base::FilePath::CharType kSyncFileSystemDir[] =
50 FILE_PATH_LITERAL("Sync FileSystem"); 50 FILE_PATH_LITERAL("Sync FileSystem");
(...skipping 2218 matching lines...) Expand 10 before | Expand all | Expand 10 after
2269 pending_batch_sync_origins_.insert(origin); 2269 pending_batch_sync_origins_.insert(origin);
2270 } 2270 }
2271 callback.Run(status, resource_id); 2271 callback.Run(status, resource_id);
2272 } 2272 }
2273 2273
2274 std::string DriveFileSyncService::sync_root_resource_id() { 2274 std::string DriveFileSyncService::sync_root_resource_id() {
2275 return metadata_store_->sync_root_directory(); 2275 return metadata_store_->sync_root_directory();
2276 } 2276 }
2277 2277
2278 } // namespace sync_file_system 2278 } // namespace sync_file_system
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698