| 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 "webkit/fileapi/file_system_quota_client.h" | 5 #include "webkit/fileapi/file_system_quota_client.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <set> | 8 #include <set> |
| 9 | 9 |
| 10 #include "base/file_path.h" | 10 #include "base/file_path.h" |
| 11 #include "base/file_util.h" | 11 #include "base/file_util.h" |
| 12 #include "base/logging.h" | 12 #include "base/logging.h" |
| 13 #include "base/memory/scoped_ptr.h" | 13 #include "base/memory/scoped_ptr.h" |
| 14 #include "base/sequenced_task_runner.h" | 14 #include "base/single_thread_task_runner.h" |
| 15 #include "googleurl/src/gurl.h" | 15 #include "googleurl/src/gurl.h" |
| 16 #include "net/base/net_util.h" | 16 #include "net/base/net_util.h" |
| 17 #include "webkit/fileapi/file_system_context.h" | 17 #include "webkit/fileapi/file_system_context.h" |
| 18 #include "webkit/fileapi/file_system_quota_util.h" | 18 #include "webkit/fileapi/file_system_quota_util.h" |
| 19 #include "webkit/fileapi/file_system_task_runners.h" |
| 19 #include "webkit/fileapi/file_system_usage_cache.h" | 20 #include "webkit/fileapi/file_system_usage_cache.h" |
| 20 #include "webkit/fileapi/file_system_util.h" | 21 #include "webkit/fileapi/file_system_util.h" |
| 21 #include "webkit/fileapi/sandbox_mount_point_provider.h" | 22 #include "webkit/fileapi/sandbox_mount_point_provider.h" |
| 22 | 23 |
| 23 using base::SequencedTaskRunner; | 24 using base::SequencedTaskRunner; |
| 24 using quota::QuotaThreadTask; | 25 using quota::QuotaThreadTask; |
| 25 using quota::StorageType; | 26 using quota::StorageType; |
| 26 | 27 |
| 27 namespace fileapi { | 28 namespace fileapi { |
| 28 | 29 |
| (...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 289 } | 290 } |
| 290 | 291 |
| 291 void FileSystemQuotaClient::DidGetOriginsForHost( | 292 void FileSystemQuotaClient::DidGetOriginsForHost( |
| 292 const TypeAndHostOrOrigin& type_and_host, const std::set<GURL>& origins) { | 293 const TypeAndHostOrOrigin& type_and_host, const std::set<GURL>& origins) { |
| 293 DCHECK(pending_origins_for_host_callbacks_.HasCallbacks(type_and_host)); | 294 DCHECK(pending_origins_for_host_callbacks_.HasCallbacks(type_and_host)); |
| 294 pending_origins_for_host_callbacks_.Run(type_and_host, origins, | 295 pending_origins_for_host_callbacks_.Run(type_and_host, origins, |
| 295 FileSystemTypeToQuotaStorageType(type_and_host.first)); | 296 FileSystemTypeToQuotaStorageType(type_and_host.first)); |
| 296 } | 297 } |
| 297 | 298 |
| 298 base::SequencedTaskRunner* FileSystemQuotaClient::file_task_runner() const { | 299 base::SequencedTaskRunner* FileSystemQuotaClient::file_task_runner() const { |
| 299 return file_system_context_->file_task_runner(); | 300 return file_system_context_->task_runners()->file_task_runner(); |
| 300 } | 301 } |
| 301 | 302 |
| 302 } // namespace fileapi | 303 } // namespace fileapi |
| OLD | NEW |