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

Side by Side Diff: chrome/browser/sync_file_system/drive_file_sync_client.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_client.h" 5 #include "chrome/browser/sync_file_system/drive_file_sync_client.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <functional> 8 #include <functional>
9 #include <sstream> 9 #include <sstream>
10 #include <string> 10 #include <string>
11 11
12 #include "base/string_util.h" 12 #include "base/string_util.h"
13 #include "base/utf_string_conversions.h" 13 #include "base/utf_string_conversions.h"
14 #include "base/values.h" 14 #include "base/values.h"
15 #include "chrome/browser/google_apis/drive_api_parser.h" 15 #include "chrome/browser/google_apis/drive_api_parser.h"
16 #include "chrome/browser/google_apis/drive_uploader.h" 16 #include "chrome/browser/google_apis/drive_uploader.h"
17 #include "chrome/browser/google_apis/gdata_wapi_service.h" 17 #include "chrome/browser/google_apis/gdata_wapi_service.h"
18 #include "chrome/browser/google_apis/gdata_wapi_url_generator.h" 18 #include "chrome/browser/google_apis/gdata_wapi_url_generator.h"
19 #include "chrome/browser/profiles/profile.h" 19 #include "chrome/browser/profiles/profile.h"
20 #include "chrome/common/extensions/extension.h" 20 #include "chrome/common/extensions/extension.h"
21 #include "extensions/common/constants.h" 21 #include "extensions/common/constants.h"
22 #include "net/base/escape.h" 22 #include "net/base/escape.h"
23 #include "net/base/mime_util.h" 23 #include "net/base/mime_util.h"
24 #include "webkit/fileapi/syncable/syncable_file_system_util.h" 24 #include "webkit/browser/fileapi/syncable/syncable_file_system_util.h"
25 25
26 namespace sync_file_system { 26 namespace sync_file_system {
27 27
28 namespace { 28 namespace {
29 29
30 enum ParentType { 30 enum ParentType {
31 PARENT_TYPE_ROOT_OR_EMPTY, 31 PARENT_TYPE_ROOT_OR_EMPTY,
32 PARENT_TYPE_DIRECTORY, 32 PARENT_TYPE_DIRECTORY,
33 }; 33 };
34 34
(...skipping 936 matching lines...) Expand 10 before | Expand all | Expand 10 after
971 return; 971 return;
972 for (UploadCallbackMap::iterator iter = upload_callback_map_.begin(); 972 for (UploadCallbackMap::iterator iter = upload_callback_map_.begin();
973 iter != upload_callback_map_.end(); ++iter) { 973 iter != upload_callback_map_.end(); ++iter) {
974 iter->second.Run(error, std::string(), std::string()); 974 iter->second.Run(error, std::string(), std::string());
975 } 975 }
976 upload_callback_map_.clear(); 976 upload_callback_map_.clear();
977 drive_uploader_.reset(new google_apis::DriveUploader(drive_service_.get())); 977 drive_uploader_.reset(new google_apis::DriveUploader(drive_service_.get()));
978 } 978 }
979 979
980 } // namespace sync_file_system 980 } // namespace sync_file_system
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698