From cd501a7565dd6054a120fbfe62d45b2299cfcc3b Mon Sep 17 00:00:00 2001 From: "pilgrim@chromium.org" Date: Fri, 22 Aug 2014 19:58:31 +0000 Subject: 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 --- webkit/browser/fileapi/isolated_context.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'webkit/browser/fileapi/isolated_context.cc') diff --git a/webkit/browser/fileapi/isolated_context.cc b/webkit/browser/fileapi/isolated_context.cc index a187a05..147e588 100644 --- a/webkit/browser/fileapi/isolated_context.cc +++ b/webkit/browser/fileapi/isolated_context.cc @@ -14,7 +14,7 @@ #include "base/strings/stringprintf.h" #include "webkit/browser/fileapi/file_system_url.h" -namespace fileapi { +namespace storage { namespace { @@ -481,4 +481,4 @@ std::string IsolatedContext::GetNewFileSystemId() const { return id; } -} // namespace fileapi +} // namespace storage -- cgit v1.1