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

Side by Side Diff: chrome/browser/extensions/api/sync_file_system/sync_file_system_api.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, 6 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/extensions/api/sync_file_system/sync_file_system_api.h" 5 #include "chrome/browser/extensions/api/sync_file_system/sync_file_system_api.h"
6 6
7 #include <string> 7 #include <string>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/stringprintf.h" 12 #include "base/stringprintf.h"
13 #include "chrome/browser/extensions/api/sync_file_system/extension_sync_event_ob server.h" 13 #include "chrome/browser/extensions/api/sync_file_system/extension_sync_event_ob server.h"
14 #include "chrome/browser/extensions/api/sync_file_system/extension_sync_event_ob server_factory.h" 14 #include "chrome/browser/extensions/api/sync_file_system/extension_sync_event_ob server_factory.h"
15 #include "chrome/browser/extensions/api/sync_file_system/sync_file_system_api_he lpers.h" 15 #include "chrome/browser/extensions/api/sync_file_system/sync_file_system_api_he lpers.h"
16 #include "chrome/browser/profiles/profile.h" 16 #include "chrome/browser/profiles/profile.h"
17 #include "chrome/browser/sync_file_system/drive_file_sync_service.h" 17 #include "chrome/browser/sync_file_system/drive_file_sync_service.h"
18 #include "chrome/browser/sync_file_system/sync_file_system_service.h" 18 #include "chrome/browser/sync_file_system/sync_file_system_service.h"
19 #include "chrome/browser/sync_file_system/sync_file_system_service_factory.h" 19 #include "chrome/browser/sync_file_system/sync_file_system_service_factory.h"
20 #include "chrome/common/extensions/api/sync_file_system.h" 20 #include "chrome/common/extensions/api/sync_file_system.h"
21 #include "content/public/browser/browser_context.h" 21 #include "content/public/browser/browser_context.h"
22 #include "content/public/browser/render_view_host.h" 22 #include "content/public/browser/render_view_host.h"
23 #include "content/public/browser/storage_partition.h" 23 #include "content/public/browser/storage_partition.h"
24 #include "content/public/common/content_client.h" 24 #include "content/public/common/content_client.h"
25 #include "webkit/browser/fileapi/file_system_context.h" 25 #include "webkit/browser/fileapi/file_system_context.h"
26 #include "webkit/browser/fileapi/file_system_url.h" 26 #include "webkit/browser/fileapi/file_system_url.h"
27 #include "webkit/browser/fileapi/syncable/sync_file_status.h"
27 #include "webkit/common/fileapi/file_system_types.h" 28 #include "webkit/common/fileapi/file_system_types.h"
28 #include "webkit/common/fileapi/file_system_util.h" 29 #include "webkit/common/fileapi/file_system_util.h"
29 #include "webkit/fileapi/syncable/sync_file_status.h"
30 #include "webkit/quota/quota_manager.h" 30 #include "webkit/quota/quota_manager.h"
31 31
32 using content::BrowserContext; 32 using content::BrowserContext;
33 using content::BrowserThread; 33 using content::BrowserThread;
34 using sync_file_system::ConflictResolutionPolicy; 34 using sync_file_system::ConflictResolutionPolicy;
35 using sync_file_system::SyncFileStatus; 35 using sync_file_system::SyncFileStatus;
36 using sync_file_system::SyncFileSystemServiceFactory; 36 using sync_file_system::SyncFileSystemServiceFactory;
37 using sync_file_system::SyncStatusCode; 37 using sync_file_system::SyncStatusCode;
38 38
39 namespace extensions { 39 namespace extensions {
(...skipping 353 matching lines...) Expand 10 before | Expand all | Expand 10 after
393 DCHECK(service); 393 DCHECK(service);
394 api::sync_file_system::ConflictResolutionPolicy policy = 394 api::sync_file_system::ConflictResolutionPolicy policy =
395 ConflictResolutionPolicyToExtensionEnum( 395 ConflictResolutionPolicyToExtensionEnum(
396 service->GetConflictResolutionPolicy()); 396 service->GetConflictResolutionPolicy());
397 SetResult(Value::CreateStringValue( 397 SetResult(Value::CreateStringValue(
398 api::sync_file_system::ToString(policy))); 398 api::sync_file_system::ToString(policy)));
399 return true; 399 return true;
400 } 400 }
401 401
402 } // namespace extensions 402 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698