chrome/browser/extensions/api/sync_file_system/sync_file_system_api.cc - Issue 559063002: Remove webkit/browser/, point everything to storage/browser/ instead

Side by Side Diff: chrome/browser/extensions/api/sync_file_system/sync_file_system_api.cc

Issue 559063002: Remove webkit/browser/, point everything to storage/browser/ instead (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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

« chrome/browser/DEPS ('K') | « chrome/browser/extensions/api/sync_file_system/sync_file_system_api.h ('k') | chrome/browser/extensions/api/sync_file_system/sync_file_system_api_helpers.cc » ('j') | webkit/common/DEPS » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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/strings/stringprintf.h"	12 #include "base/strings/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/sync_file_system_api_he lpers.h"	14 #include "chrome/browser/extensions/api/sync_file_system/sync_file_system_api_he lpers.h"

15 #include "chrome/browser/profiles/profile.h"	15 #include "chrome/browser/profiles/profile.h"

16 #include "chrome/browser/sync_file_system/sync_file_status.h"	16 #include "chrome/browser/sync_file_system/sync_file_status.h"

17 #include "chrome/browser/sync_file_system/sync_file_system_service.h"	17 #include "chrome/browser/sync_file_system/sync_file_system_service.h"

18 #include "chrome/browser/sync_file_system/sync_file_system_service_factory.h"	18 #include "chrome/browser/sync_file_system/sync_file_system_service_factory.h"

19 #include "chrome/common/extensions/api/sync_file_system.h"	19 #include "chrome/common/extensions/api/sync_file_system.h"

20 #include "content/public/browser/browser_context.h"	20 #include "content/public/browser/browser_context.h"

21 #include "content/public/browser/render_view_host.h"	21 #include "content/public/browser/render_view_host.h"

22 #include "content/public/browser/storage_partition.h"	22 #include "content/public/browser/storage_partition.h"

23 #include "content/public/common/content_client.h"	23 #include "content/public/common/content_client.h"

	24 #include "storage/browser/fileapi/file_system_context.h"

	25 #include "storage/browser/fileapi/file_system_url.h"

	26 #include "storage/browser/quota/quota_manager.h"

24 #include "storage/common/fileapi/file_system_types.h"	27 #include "storage/common/fileapi/file_system_types.h"

25 #include "storage/common/fileapi/file_system_util.h"	28 #include "storage/common/fileapi/file_system_util.h"

26 #include "webkit/browser/fileapi/file_system_context.h"

27 #include "webkit/browser/fileapi/file_system_url.h"

28 #include "webkit/browser/quota/quota_manager.h"

29	29

30 using content::BrowserContext;	30 using content::BrowserContext;

31 using content::BrowserThread;	31 using content::BrowserThread;

32 using sync_file_system::ConflictResolutionPolicy;	32 using sync_file_system::ConflictResolutionPolicy;

33 using sync_file_system::SyncFileStatus;	33 using sync_file_system::SyncFileStatus;

34 using sync_file_system::SyncFileSystemServiceFactory;	34 using sync_file_system::SyncFileSystemServiceFactory;

35 using sync_file_system::SyncStatusCode;	35 using sync_file_system::SyncStatusCode;

36	36

37 namespace extensions {	37 namespace extensions {

38	38

(...skipping 324 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
363	363

364 bool SyncFileSystemGetServiceStatusFunction::RunSync() {	364 bool SyncFileSystemGetServiceStatusFunction::RunSync() {

365 sync_file_system::SyncFileSystemService* service =	365 sync_file_system::SyncFileSystemService* service =

366 GetSyncFileSystemService(GetProfile());	366 GetSyncFileSystemService(GetProfile());

367 results_ = api::sync_file_system::GetServiceStatus::Results::Create(	367 results_ = api::sync_file_system::GetServiceStatus::Results::Create(

368 SyncServiceStateToExtensionEnum(service->GetSyncServiceState()));	368 SyncServiceStateToExtensionEnum(service->GetSyncServiceState()));

369 return true;	369 return true;

370 }	370 }

371	371

372 } // namespace extensions	372 } // namespace extensions

OLD	NEW