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

Side by Side Diff: chrome/browser/sync_file_system/local/local_file_change_tracker.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/sync_file_system/local/local_file_change_tracker.h ('k') | chrome/browser/sync_file_system/local/local_file_change_tracker_unittest.cc » ('j') | webkit/common/DEPS » ('J')
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/local_file_change_tracker.h"	5 #include "chrome/browser/sync_file_system/local/local_file_change_tracker.h"

6	6

7 #include <queue>	7 #include <queue>

8	8

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

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

11 #include "base/sequenced_task_runner.h"	11 #include "base/sequenced_task_runner.h"

12 #include "base/stl_util.h"	12 #include "base/stl_util.h"

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

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

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

	16 #include "storage/browser/fileapi/file_system_file_util.h"

	17 #include "storage/browser/fileapi/file_system_operation_context.h"

15 #include "storage/common/fileapi/file_system_util.h"	18 #include "storage/common/fileapi/file_system_util.h"

16 #include "third_party/leveldatabase/src/helpers/memenv/memenv.h"	19 #include "third_party/leveldatabase/src/helpers/memenv/memenv.h"

17 #include "third_party/leveldatabase/src/include/leveldb/db.h"	20 #include "third_party/leveldatabase/src/include/leveldb/db.h"

18 #include "third_party/leveldatabase/src/include/leveldb/env.h"	21 #include "third_party/leveldatabase/src/include/leveldb/env.h"

19 #include "third_party/leveldatabase/src/include/leveldb/write_batch.h"	22 #include "third_party/leveldatabase/src/include/leveldb/write_batch.h"

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

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

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

23	23

24 using storage::FileSystemContext;	24 using storage::FileSystemContext;

25 using storage::FileSystemFileUtil;	25 using storage::FileSystemFileUtil;

26 using storage::FileSystemOperationContext;	26 using storage::FileSystemOperationContext;

27 using storage::FileSystemURL;	27 using storage::FileSystemURL;

28 using storage::FileSystemURLSet;	28 using storage::FileSystemURLSet;

29	29

30 namespace sync_file_system {	30 namespace sync_file_system {

31	31

32 namespace {	32 namespace {

(...skipping 574 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
607 if (!status.ok() && !status.IsNotFound()) {	607 if (!status.ok() && !status.IsNotFound()) {

608 HandleError(FROM_HERE, status);	608 HandleError(FROM_HERE, status);

609 db_status_ = LevelDBStatusToSyncStatusCode(status);	609 db_status_ = LevelDBStatusToSyncStatusCode(status);

610 db_.reset();	610 db_.reset();

611 return db_status_;	611 return db_status_;

612 }	612 }

613 return SYNC_STATUS_OK;	613 return SYNC_STATUS_OK;

614 }	614 }

615	615

616 } // namespace sync_file_system	616 } // namespace sync_file_system

OLD	NEW