chrome/browser/sync_file_system/local/sync_file_system_backend.cc - Issue 559063002: Remove webkit/browser/, point everything to storage/browser/ instead

Side by Side Diff: chrome/browser/sync_file_system/local/sync_file_system_backend.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: clean up DEPS per feedback 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

« no previous file with comments | « chrome/browser/sync_file_system/local/sync_file_system_backend.h ('k') | chrome/browser/sync_file_system/local/syncable_file_operation_runner.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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/local/sync_file_system_backend.h"	5 #include "chrome/browser/sync_file_system/local/sync_file_system_backend.h"

6	6

7 #include <string>	7 #include <string>

8	8

9 #include "base/logging.h"	9 #include "base/logging.h"

10 #include "chrome/browser/chrome_notification_types.h"	10 #include "chrome/browser/chrome_notification_types.h"

11 #include "chrome/browser/sync_file_system/local/local_file_change_tracker.h"	11 #include "chrome/browser/sync_file_system/local/local_file_change_tracker.h"

12 #include "chrome/browser/sync_file_system/local/local_file_sync_context.h"	12 #include "chrome/browser/sync_file_system/local/local_file_sync_context.h"

13 #include "chrome/browser/sync_file_system/local/syncable_file_system_operation.h "	13 #include "chrome/browser/sync_file_system/local/syncable_file_system_operation.h "

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

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

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

17 #include "content/public/browser/browser_thread.h"	17 #include "content/public/browser/browser_thread.h"

18 #include "content/public/browser/notification_service.h"	18 #include "content/public/browser/notification_service.h"

	19 #include "storage/browser/blob/file_stream_reader.h"

	20 #include "storage/browser/fileapi/file_stream_writer.h"

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

	22 #include "storage/browser/fileapi/file_system_operation.h"

19 #include "storage/common/fileapi/file_system_util.h"	23 #include "storage/common/fileapi/file_system_util.h"

20 #include "webkit/browser/blob/file_stream_reader.h"

21 #include "webkit/browser/fileapi/file_stream_writer.h"

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

23 #include "webkit/browser/fileapi/file_system_operation.h"

24	24

25 using content::BrowserThread;	25 using content::BrowserThread;

26	26

27 namespace sync_file_system {	27 namespace sync_file_system {

28	28

29 namespace {	29 namespace {

30	30

31 bool CalledOnUIThread() {	31 bool CalledOnUIThread() {

32 // Ensure that these methods are called on the UI thread, except for unittests	32 // Ensure that these methods are called on the UI thread, except for unittests

33 // where a UI thread might not have been created.	33 // where a UI thread might not have been created.

(...skipping 264 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
298 SyncStatusCodeToFileError(status));	298 SyncStatusCodeToFileError(status));

299 return;	299 return;

300 }	300 }

301	301

302 callback.Run(GetSyncableFileSystemRootURI(origin_url),	302 callback.Run(GetSyncableFileSystemRootURI(origin_url),

303 GetFileSystemName(origin_url, type),	303 GetFileSystemName(origin_url, type),

304 base::File::FILE_OK);	304 base::File::FILE_OK);

305 }	305 }

306	306

307 } // namespace sync_file_system	307 } // namespace sync_file_system

OLD	NEW