summaryrefslogtreecommitdiffstats
path: root/webkit/browser/fileapi/file_system_url_request_job.h
diff options
context:
space:
mode:
authorpilgrim@chromium.org <pilgrim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-22 19:58:31 +0000
committerpilgrim@chromium.org <pilgrim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-22 20:01:57 +0000
commitcd501a7565dd6054a120fbfe62d45b2299cfcc3b (patch)
treeefe35c31d00f40b2fa9e6dbafd5f9f694f47367e /webkit/browser/fileapi/file_system_url_request_job.h
parent604e202d3548b701900c3771f9517103bb91486c (diff)
downloadchromium_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_url_request_job.h')
-rw-r--r--webkit/browser/fileapi/file_system_url_request_job.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/webkit/browser/fileapi/file_system_url_request_job.h b/webkit/browser/fileapi/file_system_url_request_job.h
index 29b42a5..5aad9e7 100644
--- a/webkit/browser/fileapi/file_system_url_request_job.h
+++ b/webkit/browser/fileapi/file_system_url_request_job.h
@@ -22,11 +22,11 @@ namespace base {
class FilePath;
}
-namespace webkit_blob {
+namespace storage {
class FileStreamReader;
}
-namespace fileapi {
+namespace storage {
class FileSystemContext;
// A request job that handles reading filesystem: URLs
@@ -69,7 +69,7 @@ class WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE FileSystemURLRequestJob
const std::string storage_domain_;
FileSystemContext* file_system_context_;
- scoped_ptr<webkit_blob::FileStreamReader> reader_;
+ scoped_ptr<storage::FileStreamReader> reader_;
FileSystemURL url_;
bool is_directory_;
scoped_ptr<net::HttpResponseInfo> response_info_;
@@ -80,6 +80,6 @@ class WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE FileSystemURLRequestJob
DISALLOW_COPY_AND_ASSIGN(FileSystemURLRequestJob);
};
-} // namespace fileapi
+} // namespace storage
#endif // WEBKIT_BROWSER_FILEAPI_FILE_SYSTEM_URL_REQUEST_JOB_H_