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

Side by Side Diff: chrome/browser/sync_file_system/local/local_file_sync_status.cc

Issue 553983013: Remove storage-related redirect headers in webkit/common/, update #includes and DEPS files to use s… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 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
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/local/local_file_sync_status.h" 5 #include "chrome/browser/sync_file_system/local/local_file_sync_status.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/stl_util.h" 8 #include "base/stl_util.h"
9 #include "webkit/common/fileapi/file_system_util.h" 9 #include "storage/common/fileapi/file_system_util.h"
10 10
11 using storage::FileSystemURL; 11 using storage::FileSystemURL;
12 using storage::FileSystemURLSet; 12 using storage::FileSystemURLSet;
13 13
14 namespace sync_file_system { 14 namespace sync_file_system {
15 15
16 namespace { 16 namespace {
17 17
18 typedef LocalFileSyncStatus::OriginAndType OriginAndType; 18 typedef LocalFileSyncStatus::OriginAndType OriginAndType;
19 19
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 const FileSystemURL& url) const { 156 const FileSystemURL& url) const {
157 DCHECK(CalledOnValidThread()); 157 DCHECK(CalledOnValidThread());
158 URLSet::const_iterator found = syncing_.find(GetOriginAndType(url)); 158 URLSet::const_iterator found = syncing_.find(GetOriginAndType(url));
159 if (found == syncing_.end()) 159 if (found == syncing_.end())
160 return false; 160 return false;
161 return ContainsChildOrParent(found->second, url.path(), 161 return ContainsChildOrParent(found->second, url.path(),
162 SetKeyHelper()); 162 SetKeyHelper());
163 } 163 }
164 164
165 } // namespace sync_file_system 165 } // namespace sync_file_system
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698