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

Side by Side Diff: chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.cc

Issue 553983013: Remove storage-related redirect headers in webkit/common/, update #includes and DEPS files to use s… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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/drive_backend/local_to_remote_syncer.h " 5 #include "chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.h "
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 11 matching lines...) Expand all
22 #include "chrome/browser/sync_file_system/drive_backend/drive_backend_util.h" 22 #include "chrome/browser/sync_file_system/drive_backend/drive_backend_util.h"
23 #include "chrome/browser/sync_file_system/drive_backend/folder_creator.h" 23 #include "chrome/browser/sync_file_system/drive_backend/folder_creator.h"
24 #include "chrome/browser/sync_file_system/drive_backend/metadata_database.h" 24 #include "chrome/browser/sync_file_system/drive_backend/metadata_database.h"
25 #include "chrome/browser/sync_file_system/drive_backend/metadata_database.pb.h" 25 #include "chrome/browser/sync_file_system/drive_backend/metadata_database.pb.h"
26 #include "chrome/browser/sync_file_system/drive_backend/sync_engine_context.h" 26 #include "chrome/browser/sync_file_system/drive_backend/sync_engine_context.h"
27 #include "chrome/browser/sync_file_system/drive_backend/sync_task_manager.h" 27 #include "chrome/browser/sync_file_system/drive_backend/sync_task_manager.h"
28 #include "chrome/browser/sync_file_system/drive_backend/sync_task_token.h" 28 #include "chrome/browser/sync_file_system/drive_backend/sync_task_token.h"
29 #include "chrome/browser/sync_file_system/logger.h" 29 #include "chrome/browser/sync_file_system/logger.h"
30 #include "google_apis/drive/drive_api_parser.h" 30 #include "google_apis/drive/drive_api_parser.h"
31 #include "net/base/mime_util.h" 31 #include "net/base/mime_util.h"
32 #include "webkit/common/fileapi/file_system_util.h" 32 #include "storage/common/fileapi/file_system_util.h"
33 33
34 namespace sync_file_system { 34 namespace sync_file_system {
35 namespace drive_backend { 35 namespace drive_backend {
36 36
37 namespace { 37 namespace {
38 38
39 scoped_ptr<FileTracker> FindTrackerByID(MetadataDatabase* metadata_database, 39 scoped_ptr<FileTracker> FindTrackerByID(MetadataDatabase* metadata_database,
40 int64 tracker_id) { 40 int64 tracker_id) {
41 scoped_ptr<FileTracker> tracker(new FileTracker); 41 scoped_ptr<FileTracker> tracker(new FileTracker);
42 if (metadata_database->FindTrackerByTrackerID(tracker_id, tracker.get())) 42 if (metadata_database->FindTrackerByTrackerID(tracker_id, tracker.get()))
(...skipping 729 matching lines...) Expand 10 before | Expand all | Expand 10 after
772 set_used_network(true); 772 set_used_network(true);
773 return sync_context_->GetDriveUploader(); 773 return sync_context_->GetDriveUploader();
774 } 774 }
775 775
776 MetadataDatabase* LocalToRemoteSyncer::metadata_database() { 776 MetadataDatabase* LocalToRemoteSyncer::metadata_database() {
777 return sync_context_->GetMetadataDatabase(); 777 return sync_context_->GetMetadataDatabase();
778 } 778 }
779 779
780 } // namespace drive_backend 780 } // namespace drive_backend
781 } // namespace sync_file_system 781 } // namespace sync_file_system
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698