diff options
| author | pilgrim@chromium.org <pilgrim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-22 19:58:31 +0000 |
|---|---|---|
| committer | pilgrim@chromium.org <pilgrim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-22 20:01:57 +0000 |
| commit | cd501a7565dd6054a120fbfe62d45b2299cfcc3b (patch) | |
| tree | efe35c31d00f40b2fa9e6dbafd5f9f694f47367e /webkit/browser/fileapi/file_system_operation_context.h | |
| parent | 604e202d3548b701900c3771f9517103bb91486c (diff) | |
| download | chromium_src-cd501a7565dd6054a120fbfe62d45b2299cfcc3b.zip chromium_src-cd501a7565dd6054a120fbfe62d45b2299cfcc3b.tar.gz chromium_src-cd501a7565dd6054a120fbfe62d45b2299cfcc3b.tar.bz2 | |
Collapse fileapi, webkit_blob, webkit_database, quota, and webkit_common namespaces into single storage namespace
As discussed here:
https://groups.google.com/a/chromium.org/forum/#!topic/storage-dev/aQall8GOrS4
BUG=338338
TBR=cevans
NOTRY=true
Review URL: https://codereview.chromium.org/492873002
Cr-Commit-Position: refs/heads/master@{#291485}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@291485 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/browser/fileapi/file_system_operation_context.h')
| -rw-r--r-- | webkit/browser/fileapi/file_system_operation_context.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/webkit/browser/fileapi/file_system_operation_context.h b/webkit/browser/fileapi/file_system_operation_context.h index decdecb..0428bb4 100644 --- a/webkit/browser/fileapi/file_system_operation_context.h +++ b/webkit/browser/fileapi/file_system_operation_context.h @@ -16,7 +16,7 @@ namespace base { class SequencedTaskRunner; } -namespace fileapi { +namespace storage { class FileSystemContext; @@ -50,7 +50,7 @@ class WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE FileSystemOperationContext // Returns the current remaining quota. int64 allowed_bytes_growth() const { return allowed_bytes_growth_; } - quota::QuotaLimitType quota_limit_type() const { return quota_limit_type_; } + storage::QuotaLimitType quota_limit_type() const { return quota_limit_type_; } base::SequencedTaskRunner* task_runner() const { return task_runner_.get(); } ChangeObserverList* change_observers() { return &change_observers_; } @@ -67,7 +67,7 @@ class WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE FileSystemOperationContext DCHECK(setter_thread_checker_.CalledOnValidThread()); update_observers_ = list; } - void set_quota_limit_type(quota::QuotaLimitType limit_type) { + void set_quota_limit_type(storage::QuotaLimitType limit_type) { DCHECK(setter_thread_checker_.CalledOnValidThread()); quota_limit_type_ = limit_type; } @@ -80,7 +80,7 @@ class WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE FileSystemOperationContext int64 allowed_bytes_growth_; // The current quota limit type, used by ObfuscatedFileUtil. - quota::QuotaLimitType quota_limit_type_; + storage::QuotaLimitType quota_limit_type_; // Observers attached to this context. ChangeObserverList change_observers_; @@ -92,6 +92,6 @@ class WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE FileSystemOperationContext DISALLOW_COPY_AND_ASSIGN(FileSystemOperationContext); }; -} // namespace fileapi +} // namespace storage #endif // WEBKIT_BROWSER_FILEAPI_FILE_SYSTEM_OPERATION_CONTEXT_H_ |