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

Side by Side Diff: chrome/browser/sync_file_system/drive/api_util.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
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/api_util.h" 5 #include "chrome/browser/sync_file_system/drive/api_util.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_api_service.h" 16 #include "chrome/browser/google_apis/drive_api_service.h"
17 #include "chrome/browser/google_apis/drive_uploader.h" 17 #include "chrome/browser/google_apis/drive_uploader.h"
18 #include "chrome/browser/google_apis/gdata_wapi_service.h" 18 #include "chrome/browser/google_apis/gdata_wapi_service.h"
19 #include "chrome/browser/google_apis/gdata_wapi_url_generator.h" 19 #include "chrome/browser/google_apis/gdata_wapi_url_generator.h"
20 #include "chrome/browser/profiles/profile.h" 20 #include "chrome/browser/profiles/profile.h"
21 #include "chrome/browser/sync_file_system/drive_file_sync_util.h" 21 #include "chrome/browser/sync_file_system/drive_file_sync_util.h"
22 #include "chrome/browser/sync_file_system/logger.h" 22 #include "chrome/browser/sync_file_system/logger.h"
23 #include "chrome/common/extensions/extension.h" 23 #include "chrome/common/extensions/extension.h"
24 #include "extensions/common/constants.h" 24 #include "extensions/common/constants.h"
25 #include "net/base/escape.h" 25 #include "net/base/escape.h"
26 #include "net/base/mime_util.h" 26 #include "net/base/mime_util.h"
27 #include "webkit/fileapi/syncable/syncable_file_system_util.h" 27 #include "webkit/browser/fileapi/syncable/syncable_file_system_util.h"
28 28
29 namespace sync_file_system { 29 namespace sync_file_system {
30 namespace drive { 30 namespace drive {
31 31
32 namespace { 32 namespace {
33 33
34 enum ParentType { 34 enum ParentType {
35 PARENT_TYPE_ROOT_OR_EMPTY, 35 PARENT_TYPE_ROOT_OR_EMPTY,
36 PARENT_TYPE_DIRECTORY, 36 PARENT_TYPE_DIRECTORY,
37 }; 37 };
(...skipping 1023 matching lines...) Expand 10 before | Expand all | Expand 10 after
1061 std::string APIUtil::GetRootResourceId() const { 1061 std::string APIUtil::GetRootResourceId() const {
1062 if (IsDriveAPIEnabled()) { 1062 if (IsDriveAPIEnabled()) {
1063 DCHECK(!root_resource_id_.empty()); 1063 DCHECK(!root_resource_id_.empty());
1064 return root_resource_id_; 1064 return root_resource_id_;
1065 } 1065 }
1066 return drive_service_->GetRootResourceId(); 1066 return drive_service_->GetRootResourceId();
1067 } 1067 }
1068 1068
1069 } // namespace drive 1069 } // namespace drive
1070 } // namespace sync_file_system 1070 } // namespace sync_file_system
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698