diff options
-rw-r--r-- | chrome/chrome_tests.gypi | 2 | ||||
-rw-r--r-- | content/browser/browser_context.cc | 2 | ||||
-rw-r--r-- | content/browser/fileapi/OWNERS (renamed from content/common/file_system/OWNERS) | 1 | ||||
-rw-r--r-- | content/browser/fileapi/browser_file_system_helper.cc (renamed from content/browser/file_system/browser_file_system_helper.cc) | 2 | ||||
-rw-r--r-- | content/browser/fileapi/browser_file_system_helper.h (renamed from content/browser/file_system/browser_file_system_helper.h) | 8 | ||||
-rw-r--r-- | content/browser/fileapi/chrome_blob_storage_context.cc (renamed from content/browser/chrome_blob_storage_context.cc) | 4 | ||||
-rw-r--r-- | content/browser/fileapi/chrome_blob_storage_context.h (renamed from content/browser/chrome_blob_storage_context.h) | 8 | ||||
-rw-r--r-- | content/browser/fileapi/file_system_browsertest.cc (renamed from content/browser/file_system/file_system_browsertest.cc) | 2 | ||||
-rw-r--r-- | content/browser/fileapi/fileapi_message_filter.cc (renamed from content/browser/file_system/file_and_blob_message_filter.cc) | 146 | ||||
-rw-r--r-- | content/browser/fileapi/fileapi_message_filter.h (renamed from content/browser/file_system/file_and_blob_message_filter.h) | 16 | ||||
-rw-r--r-- | content/browser/renderer_host/render_process_host_impl.cc | 8 | ||||
-rw-r--r-- | content/browser/renderer_host/resource_dispatcher_host.cc | 2 | ||||
-rw-r--r-- | content/browser/resource_context_impl.cc | 4 | ||||
-rw-r--r-- | content/browser/worker_host/worker_process_host.cc | 4 | ||||
-rw-r--r-- | content/common/child_thread.cc | 4 | ||||
-rw-r--r-- | content/common/content_message_generator.h | 4 | ||||
-rw-r--r-- | content/common/fileapi/OWNERS (renamed from content/browser/file_system/OWNERS) | 1 | ||||
-rw-r--r-- | content/common/fileapi/file_system_dispatcher.cc (renamed from content/common/file_system/file_system_dispatcher.cc) | 4 | ||||
-rw-r--r-- | content/common/fileapi/file_system_dispatcher.h (renamed from content/common/file_system/file_system_dispatcher.h) | 6 | ||||
-rw-r--r-- | content/common/fileapi/file_system_messages.h (renamed from content/common/file_system_messages.h) | 0 | ||||
-rw-r--r-- | content/common/fileapi/webblob_messages.h (renamed from content/common/webblob_messages.h) | 2 | ||||
-rw-r--r-- | content/common/fileapi/webblobregistry_impl.cc (renamed from content/common/webblobregistry_impl.cc) | 6 | ||||
-rw-r--r-- | content/common/fileapi/webblobregistry_impl.h (renamed from content/common/webblobregistry_impl.h) | 8 | ||||
-rw-r--r-- | content/common/fileapi/webfilesystem_callback_dispatcher.cc (renamed from content/common/file_system/webfilesystem_callback_dispatcher.cc) | 4 | ||||
-rw-r--r-- | content/common/fileapi/webfilesystem_callback_dispatcher.h (renamed from content/common/file_system/webfilesystem_callback_dispatcher.h) | 8 | ||||
-rw-r--r-- | content/common/fileapi/webfilesystem_impl.cc (renamed from content/common/file_system/webfilesystem_impl.cc) | 10 | ||||
-rw-r--r-- | content/common/fileapi/webfilesystem_impl.h (renamed from content/common/file_system/webfilesystem_impl.h) | 8 | ||||
-rw-r--r-- | content/common/fileapi/webfilewriter_impl.cc (renamed from content/common/file_system/webfilewriter_impl.cc) | 6 | ||||
-rw-r--r-- | content/common/fileapi/webfilewriter_impl.h (renamed from content/common/file_system/webfilewriter_impl.h) | 8 | ||||
-rw-r--r-- | content/content_browser.gypi | 12 | ||||
-rw-r--r-- | content/content_common.gypi | 24 | ||||
-rw-r--r-- | content/renderer/pepper/pepper_plugin_delegate_impl.cc | 4 | ||||
-rw-r--r-- | content/renderer/render_view_impl.cc | 4 | ||||
-rw-r--r-- | content/renderer/renderer_webkitplatformsupport_impl.cc | 4 | ||||
-rw-r--r-- | content/worker/websharedworker_stub.cc | 4 | ||||
-rw-r--r-- | content/worker/websharedworkerclient_proxy.cc | 4 | ||||
-rw-r--r-- | content/worker/worker_webkitplatformsupport_impl.cc | 4 |
37 files changed, 175 insertions, 173 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 019811d..904d4f3 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -2865,7 +2865,7 @@ '../content/browser/child_process_security_policy_browsertest.cc', '../content/browser/device_orientation/device_orientation_browsertest.cc', '../content/browser/download/mhtml_generation_browsertest.cc', - '../content/browser/file_system/file_system_browsertest.cc', + '../content/browser/fileapi/file_system_browsertest.cc', '../content/browser/in_process_webkit/dom_storage_browsertest.cc', '../content/browser/in_process_webkit/indexed_db_browsertest.cc', '../content/browser/indexed_db/idbbindingutilities_browsertest.cc', diff --git a/content/browser/browser_context.cc b/content/browser/browser_context.cc index c6c48a7..94d0661 100644 --- a/content/browser/browser_context.cc +++ b/content/browser/browser_context.cc @@ -5,7 +5,7 @@ #include "content/public/browser/browser_context.h" #include "content/browser/appcache/chrome_appcache_service.h" -#include "content/browser/file_system/browser_file_system_helper.h" +#include "content/browser/fileapi/browser_file_system_helper.h" #include "content/browser/in_process_webkit/dom_storage_context_impl.h" #include "content/browser/in_process_webkit/indexed_db_context_impl.h" #include "content/browser/resource_context_impl.h" diff --git a/content/common/file_system/OWNERS b/content/browser/fileapi/OWNERS index 4b079f8..f7cc33c 100644 --- a/content/common/file_system/OWNERS +++ b/content/browser/fileapi/OWNERS @@ -1,3 +1,4 @@ ericu@chromium.org kinuko@chromium.org michaeln@chromium.org +jianli@chromium.org diff --git a/content/browser/file_system/browser_file_system_helper.cc b/content/browser/fileapi/browser_file_system_helper.cc index 8ccf103..a6321b0 100644 --- a/content/browser/file_system/browser_file_system_helper.cc +++ b/content/browser/fileapi/browser_file_system_helper.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/browser/file_system/browser_file_system_helper.h" +#include "content/browser/fileapi/browser_file_system_helper.h" #include <vector> #include <string> diff --git a/content/browser/file_system/browser_file_system_helper.h b/content/browser/fileapi/browser_file_system_helper.h index 7d8cdce..dd1490f 100644 --- a/content/browser/file_system/browser_file_system_helper.h +++ b/content/browser/fileapi/browser_file_system_helper.h @@ -1,9 +1,9 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_BROWSER_FILE_SYSTEM_BROWSER_FILE_SYSTEM_HELPER_H_ -#define CONTENT_BROWSER_FILE_SYSTEM_BROWSER_FILE_SYSTEM_HELPER_H_ +#ifndef CONTENT_BROWSER_FILEAPI_BROWSER_FILE_SYSTEM_HELPER_H_ +#define CONTENT_BROWSER_FILEAPI_BROWSER_FILE_SYSTEM_HELPER_H_ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" @@ -23,4 +23,4 @@ CreateFileSystemContext( quota::SpecialStoragePolicy* special_storage_policy, quota::QuotaManagerProxy* quota_manager_proxy); -#endif // CONTENT_BROWSER_FILE_SYSTEM_BROWSER_FILE_SYSTEM_HELPER_H_ +#endif // CONTENT_BROWSER_FILEAPI_BROWSER_FILE_SYSTEM_HELPER_H_ diff --git a/content/browser/chrome_blob_storage_context.cc b/content/browser/fileapi/chrome_blob_storage_context.cc index e244fe4..7a753d3 100644 --- a/content/browser/chrome_blob_storage_context.cc +++ b/content/browser/fileapi/chrome_blob_storage_context.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/browser/chrome_blob_storage_context.h" +#include "content/browser/fileapi/chrome_blob_storage_context.h" #include "base/bind.h" #include "content/public/browser/browser_context.h" diff --git a/content/browser/chrome_blob_storage_context.h b/content/browser/fileapi/chrome_blob_storage_context.h index 0b5c820..6917340 100644 --- a/content/browser/chrome_blob_storage_context.h +++ b/content/browser/fileapi/chrome_blob_storage_context.h @@ -1,9 +1,9 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_BROWSER_CHROME_BLOB_STORAGE_CONTEXT_H_ -#define CONTENT_BROWSER_CHROME_BLOB_STORAGE_CONTEXT_H_ +#ifndef CONTENT_BROWSER_FILEAPI_CHROME_BLOB_STORAGE_CONTEXT_H_ +#define CONTENT_BROWSER_FILEAPI_CHROME_BLOB_STORAGE_CONTEXT_H_ #pragma once #include "base/memory/ref_counted.h" @@ -59,4 +59,4 @@ struct ChromeBlobStorageContextDeleter { } }; -#endif // CONTENT_BROWSER_CHROME_BLOB_STORAGE_CONTEXT_H_ +#endif // CONTENT_BROWSER_FILEAPI_CHROME_BLOB_STORAGE_CONTEXT_H_ diff --git a/content/browser/file_system/file_system_browsertest.cc b/content/browser/fileapi/file_system_browsertest.cc index edd7cc9..504fe77 100644 --- a/content/browser/file_system/file_system_browsertest.cc +++ b/content/browser/fileapi/file_system_browsertest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/content/browser/file_system/file_and_blob_message_filter.cc b/content/browser/fileapi/fileapi_message_filter.cc index 14860953..ee88d38 100644 --- a/content/browser/file_system/file_and_blob_message_filter.cc +++ b/content/browser/fileapi/fileapi_message_filter.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/browser/file_system/file_and_blob_message_filter.h" +#include "content/browser/fileapi/fileapi_message_filter.h" #include <string> #include <vector> @@ -14,9 +14,9 @@ #include "base/threading/thread.h" #include "base/time.h" #include "content/browser/child_process_security_policy_impl.h" -#include "content/browser/chrome_blob_storage_context.h" -#include "content/common/file_system_messages.h" -#include "content/common/webblob_messages.h" +#include "content/browser/fileapi/chrome_blob_storage_context.h" +#include "content/common/fileapi/file_system_messages.h" +#include "content/common/fileapi/webblob_messages.h" #include "content/public/browser/user_metrics.h" #include "googleurl/src/gurl.h" #include "ipc/ipc_platform_file.h" @@ -68,7 +68,7 @@ const int kOpenFilePermissions = base::PLATFORM_FILE_CREATE | } // namespace -FileAndBlobMessageFilter::FileAndBlobMessageFilter( +FileAPIMessageFilter::FileAPIMessageFilter( int process_id, net::URLRequestContextGetter* request_context_getter, fileapi::FileSystemContext* file_system_context, @@ -83,7 +83,7 @@ FileAndBlobMessageFilter::FileAndBlobMessageFilter( DCHECK(blob_storage_context); } -FileAndBlobMessageFilter::FileAndBlobMessageFilter( +FileAPIMessageFilter::FileAPIMessageFilter( int process_id, net::URLRequestContext* request_context, fileapi::FileSystemContext* file_system_context, @@ -97,10 +97,10 @@ FileAndBlobMessageFilter::FileAndBlobMessageFilter( DCHECK(blob_storage_context); } -FileAndBlobMessageFilter::~FileAndBlobMessageFilter() { +FileAPIMessageFilter::~FileAPIMessageFilter() { } -void FileAndBlobMessageFilter::OnChannelConnected(int32 peer_pid) { +void FileAPIMessageFilter::OnChannelConnected(int32 peer_pid) { BrowserMessageFilter::OnChannelConnected(peer_pid); if (request_context_getter_.get()) { @@ -111,7 +111,7 @@ void FileAndBlobMessageFilter::OnChannelConnected(int32 peer_pid) { } } -void FileAndBlobMessageFilter::OnChannelClosing() { +void FileAPIMessageFilter::OnChannelClosing() { BrowserMessageFilter::OnChannelClosing(); // Unregister all the blob URLs that are previously registered in this @@ -122,18 +122,18 @@ void FileAndBlobMessageFilter::OnChannelClosing() { } } -void FileAndBlobMessageFilter::OverrideThreadForMessage( +void FileAPIMessageFilter::OverrideThreadForMessage( const IPC::Message& message, BrowserThread::ID* thread) { if (message.type() == FileSystemHostMsg_SyncGetPlatformPath::ID) *thread = BrowserThread::FILE; } -bool FileAndBlobMessageFilter::OnMessageReceived( +bool FileAPIMessageFilter::OnMessageReceived( const IPC::Message& message, bool* message_was_ok) { *message_was_ok = true; bool handled = true; - IPC_BEGIN_MESSAGE_MAP_EX(FileAndBlobMessageFilter, message, *message_was_ok) + IPC_BEGIN_MESSAGE_MAP_EX(FileAPIMessageFilter, message, *message_was_ok) IPC_MESSAGE_HANDLER(FileSystemHostMsg_Open, OnOpen) IPC_MESSAGE_HANDLER(FileSystemHostMsg_Move, OnMove) IPC_MESSAGE_HANDLER(FileSystemHostMsg_Copy, OnCopy) @@ -165,7 +165,7 @@ bool FileAndBlobMessageFilter::OnMessageReceived( return handled; } -void FileAndBlobMessageFilter::OnOpen( +void FileAPIMessageFilter::OnOpen( int request_id, const GURL& origin_url, fileapi::FileSystemType type, int64 requested_size, bool create) { if (type == fileapi::kFileSystemTypeTemporary) { @@ -174,10 +174,10 @@ void FileAndBlobMessageFilter::OnOpen( content::RecordAction(UserMetricsAction("OpenFileSystemPersistent")); } context_->OpenFileSystem(origin_url, type, create, base::Bind( - &FileAndBlobMessageFilter::DidOpenFileSystem, this, request_id)); + &FileAPIMessageFilter::DidOpenFileSystem, this, request_id)); } -void FileAndBlobMessageFilter::OnMove( +void FileAPIMessageFilter::OnMove( int request_id, const GURL& src_path, const GURL& dest_path) { base::PlatformFileError error; const int src_permissions = kReadFilePermissions | kWriteFilePermissions; @@ -189,10 +189,10 @@ void FileAndBlobMessageFilter::OnMove( GetNewOperation(src_path, request_id)->Move( src_path, dest_path, - base::Bind(&FileAndBlobMessageFilter::DidFinish, this, request_id)); + base::Bind(&FileAPIMessageFilter::DidFinish, this, request_id)); } -void FileAndBlobMessageFilter::OnCopy( +void FileAPIMessageFilter::OnCopy( int request_id, const GURL& src_path, const GURL& dest_path) { base::PlatformFileError error; if (!HasPermissionsForFile(src_path, kReadFilePermissions, &error) || @@ -203,10 +203,10 @@ void FileAndBlobMessageFilter::OnCopy( GetNewOperation(src_path, request_id)->Copy( src_path, dest_path, - base::Bind(&FileAndBlobMessageFilter::DidFinish, this, request_id)); + base::Bind(&FileAPIMessageFilter::DidFinish, this, request_id)); } -void FileAndBlobMessageFilter::OnRemove( +void FileAPIMessageFilter::OnRemove( int request_id, const GURL& path, bool recursive) { base::PlatformFileError error; if (!HasPermissionsForFile(path, kWriteFilePermissions, &error)) { @@ -216,10 +216,10 @@ void FileAndBlobMessageFilter::OnRemove( GetNewOperation(path, request_id)->Remove( path, recursive, - base::Bind(&FileAndBlobMessageFilter::DidFinish, this, request_id)); + base::Bind(&FileAPIMessageFilter::DidFinish, this, request_id)); } -void FileAndBlobMessageFilter::OnReadMetadata( +void FileAPIMessageFilter::OnReadMetadata( int request_id, const GURL& path) { base::PlatformFileError error; if (!HasPermissionsForFile(path, kReadFilePermissions, &error)) { @@ -229,10 +229,10 @@ void FileAndBlobMessageFilter::OnReadMetadata( GetNewOperation(path, request_id)->GetMetadata( path, - base::Bind(&FileAndBlobMessageFilter::DidGetMetadata, this, request_id)); + base::Bind(&FileAPIMessageFilter::DidGetMetadata, this, request_id)); } -void FileAndBlobMessageFilter::OnCreate( +void FileAPIMessageFilter::OnCreate( int request_id, const GURL& path, bool exclusive, bool is_directory, bool recursive) { base::PlatformFileError error; @@ -244,15 +244,15 @@ void FileAndBlobMessageFilter::OnCreate( if (is_directory) { GetNewOperation(path, request_id)->CreateDirectory( path, exclusive, recursive, - base::Bind(&FileAndBlobMessageFilter::DidFinish, this, request_id)); + base::Bind(&FileAPIMessageFilter::DidFinish, this, request_id)); } else { GetNewOperation(path, request_id)->CreateFile( path, exclusive, - base::Bind(&FileAndBlobMessageFilter::DidFinish, this, request_id)); + base::Bind(&FileAPIMessageFilter::DidFinish, this, request_id)); } } -void FileAndBlobMessageFilter::OnExists( +void FileAPIMessageFilter::OnExists( int request_id, const GURL& path, bool is_directory) { base::PlatformFileError error; if (!HasPermissionsForFile(path, kReadFilePermissions, &error)) { @@ -263,15 +263,15 @@ void FileAndBlobMessageFilter::OnExists( if (is_directory) { GetNewOperation(path, request_id)->DirectoryExists( path, - base::Bind(&FileAndBlobMessageFilter::DidFinish, this, request_id)); + base::Bind(&FileAPIMessageFilter::DidFinish, this, request_id)); } else { GetNewOperation(path, request_id)->FileExists( path, - base::Bind(&FileAndBlobMessageFilter::DidFinish, this, request_id)); + base::Bind(&FileAPIMessageFilter::DidFinish, this, request_id)); } } -void FileAndBlobMessageFilter::OnReadDirectory( +void FileAPIMessageFilter::OnReadDirectory( int request_id, const GURL& path) { base::PlatformFileError error; if (!HasPermissionsForFile(path, kReadFilePermissions, &error)) { @@ -280,11 +280,11 @@ void FileAndBlobMessageFilter::OnReadDirectory( } GetNewOperation(path, request_id)->ReadDirectory( - path, base::Bind(&FileAndBlobMessageFilter::DidReadDirectory, + path, base::Bind(&FileAPIMessageFilter::DidReadDirectory, this, request_id)); } -void FileAndBlobMessageFilter::OnWrite( +void FileAPIMessageFilter::OnWrite( int request_id, const GURL& path, const GURL& blob_url, @@ -303,10 +303,10 @@ void FileAndBlobMessageFilter::OnWrite( GetNewOperation(path, request_id)->Write( request_context_, path, blob_url, offset, - base::Bind(&FileAndBlobMessageFilter::DidWrite, this, request_id)); + base::Bind(&FileAPIMessageFilter::DidWrite, this, request_id)); } -void FileAndBlobMessageFilter::OnTruncate( +void FileAPIMessageFilter::OnTruncate( int request_id, const GURL& path, int64 length) { @@ -318,10 +318,10 @@ void FileAndBlobMessageFilter::OnTruncate( GetNewOperation(path, request_id)->Truncate( path, length, - base::Bind(&FileAndBlobMessageFilter::DidFinish, this, request_id)); + base::Bind(&FileAPIMessageFilter::DidFinish, this, request_id)); } -void FileAndBlobMessageFilter::OnTouchFile( +void FileAPIMessageFilter::OnTouchFile( int request_id, const GURL& path, const base::Time& last_access_time, @@ -334,10 +334,10 @@ void FileAndBlobMessageFilter::OnTouchFile( GetNewOperation(path, request_id)->TouchFile( path, last_access_time, last_modified_time, - base::Bind(&FileAndBlobMessageFilter::DidFinish, this, request_id)); + base::Bind(&FileAPIMessageFilter::DidFinish, this, request_id)); } -void FileAndBlobMessageFilter::OnCancel( +void FileAPIMessageFilter::OnCancel( int request_id, int request_id_to_cancel) { FileSystemOperationInterface* write = operations_.Lookup( @@ -346,7 +346,7 @@ void FileAndBlobMessageFilter::OnCancel( // The cancel will eventually send both the write failure and the cancel // success. write->Cancel( - base::Bind(&FileAndBlobMessageFilter::DidCancel, this, request_id)); + base::Bind(&FileAPIMessageFilter::DidCancel, this, request_id)); } else { // The write already finished; report that we failed to stop it. Send(new FileSystemMsg_DidFail( @@ -354,7 +354,7 @@ void FileAndBlobMessageFilter::OnCancel( } } -void FileAndBlobMessageFilter::OnOpenFile( +void FileAPIMessageFilter::OnOpenFile( int request_id, const GURL& path, int file_flags) { base::PlatformFileError error; const int open_permissions = base::PLATFORM_FILE_OPEN | @@ -366,10 +366,10 @@ void FileAndBlobMessageFilter::OnOpenFile( GetNewOperation(path, request_id)->OpenFile( path, file_flags, peer_handle(), - base::Bind(&FileAndBlobMessageFilter::DidOpenFile, this, request_id)); + base::Bind(&FileAPIMessageFilter::DidOpenFile, this, request_id)); } -void FileAndBlobMessageFilter::OnWillUpdate(const GURL& path) { +void FileAPIMessageFilter::OnWillUpdate(const GURL& path) { GURL origin_url; fileapi::FileSystemType type; if (!CrackFileSystemURL(path, &origin_url, &type, NULL)) @@ -380,7 +380,7 @@ void FileAndBlobMessageFilter::OnWillUpdate(const GURL& path) { quota_util->proxy()->StartUpdateOrigin(origin_url, type); } -void FileAndBlobMessageFilter::OnDidUpdate(const GURL& path, int64 delta) { +void FileAPIMessageFilter::OnDidUpdate(const GURL& path, int64 delta) { GURL origin_url; fileapi::FileSystemType type; if (!CrackFileSystemURL(path, &origin_url, &type, NULL)) @@ -393,7 +393,7 @@ void FileAndBlobMessageFilter::OnDidUpdate(const GURL& path, int64 delta) { quota_util->proxy()->EndUpdateOrigin(origin_url, type); } -void FileAndBlobMessageFilter::OnSyncGetPlatformPath( +void FileAPIMessageFilter::OnSyncGetPlatformPath( const GURL& path, FilePath* platform_path) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); DCHECK(platform_path); @@ -421,22 +421,22 @@ void FileAndBlobMessageFilter::OnSyncGetPlatformPath( operation->SyncGetPlatformPath(path, platform_path); } -void FileAndBlobMessageFilter::OnCreateSnapshotFile( +void FileAPIMessageFilter::OnCreateSnapshotFile( int request_id, const GURL& blob_url, const GURL& path) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); GetNewOperation(path, request_id)->CreateSnapshotFile( path, - base::Bind(&FileAndBlobMessageFilter::DidCreateSnapshot, + base::Bind(&FileAPIMessageFilter::DidCreateSnapshot, this, request_id, blob_url)); } -void FileAndBlobMessageFilter::OnStartBuildingBlob(const GURL& url) { +void FileAPIMessageFilter::OnStartBuildingBlob(const GURL& url) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); blob_storage_context_->controller()->StartBuildingBlob(url); blob_urls_.insert(url.spec()); } -void FileAndBlobMessageFilter::OnAppendBlobDataItem( +void FileAPIMessageFilter::OnAppendBlobDataItem( const GURL& url, const BlobData::Item& item) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); if (item.type == BlobData::TYPE_FILE && @@ -448,7 +448,7 @@ void FileAndBlobMessageFilter::OnAppendBlobDataItem( blob_storage_context_->controller()->AppendBlobDataItem(url, item); } -void FileAndBlobMessageFilter::OnAppendSharedMemory( +void FileAPIMessageFilter::OnAppendSharedMemory( const GURL& url, base::SharedMemoryHandle handle, size_t buffer_size) { DCHECK(base::SharedMemory::IsHandleValid(handle)); #if defined(OS_WIN) @@ -467,27 +467,27 @@ void FileAndBlobMessageFilter::OnAppendSharedMemory( blob_storage_context_->controller()->AppendBlobDataItem(url, item); } -void FileAndBlobMessageFilter::OnFinishBuildingBlob( +void FileAPIMessageFilter::OnFinishBuildingBlob( const GURL& url, const std::string& content_type) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); blob_storage_context_->controller()->FinishBuildingBlob(url, content_type); } -void FileAndBlobMessageFilter::OnCloneBlob( +void FileAPIMessageFilter::OnCloneBlob( const GURL& url, const GURL& src_url) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); blob_storage_context_->controller()->CloneBlob(url, src_url); blob_urls_.insert(url.spec()); } -void FileAndBlobMessageFilter::OnRemoveBlob(const GURL& url) { +void FileAPIMessageFilter::OnRemoveBlob(const GURL& url) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); blob_storage_context_->controller()->RemoveBlob(url); blob_urls_.erase(url.spec()); } -void FileAndBlobMessageFilter::DidFinish(int request_id, - base::PlatformFileError result) { +void FileAPIMessageFilter::DidFinish(int request_id, + base::PlatformFileError result) { if (result == base::PLATFORM_FILE_OK) Send(new FileSystemMsg_DidSucceed(request_id)); else @@ -495,8 +495,8 @@ void FileAndBlobMessageFilter::DidFinish(int request_id, UnregisterOperation(request_id); } -void FileAndBlobMessageFilter::DidCancel(int request_id, - base::PlatformFileError result) { +void FileAPIMessageFilter::DidCancel(int request_id, + base::PlatformFileError result) { if (result == base::PLATFORM_FILE_OK) Send(new FileSystemMsg_DidSucceed(request_id)); else @@ -504,7 +504,7 @@ void FileAndBlobMessageFilter::DidCancel(int request_id, // For Cancel we do not create a new operation, so no unregister here. } -void FileAndBlobMessageFilter::DidGetMetadata( +void FileAPIMessageFilter::DidGetMetadata( int request_id, base::PlatformFileError result, const base::PlatformFileInfo& info, @@ -516,7 +516,7 @@ void FileAndBlobMessageFilter::DidGetMetadata( UnregisterOperation(request_id); } -void FileAndBlobMessageFilter::DidReadDirectory( +void FileAPIMessageFilter::DidReadDirectory( int request_id, base::PlatformFileError result, const std::vector<base::FileUtilProxy::Entry>& entries, @@ -528,10 +528,10 @@ void FileAndBlobMessageFilter::DidReadDirectory( UnregisterOperation(request_id); } -void FileAndBlobMessageFilter::DidOpenFile(int request_id, - base::PlatformFileError result, - base::PlatformFile file, - base::ProcessHandle peer_handle) { +void FileAPIMessageFilter::DidOpenFile(int request_id, + base::PlatformFileError result, + base::PlatformFile file, + base::ProcessHandle peer_handle) { if (result == base::PLATFORM_FILE_OK) { IPC::PlatformFileForTransit file_for_transit = file != base::kInvalidPlatformFileValue ? @@ -544,10 +544,10 @@ void FileAndBlobMessageFilter::DidOpenFile(int request_id, UnregisterOperation(request_id); } -void FileAndBlobMessageFilter::DidWrite(int request_id, - base::PlatformFileError result, - int64 bytes, - bool complete) { +void FileAPIMessageFilter::DidWrite(int request_id, + base::PlatformFileError result, + int64 bytes, + bool complete) { if (result == base::PLATFORM_FILE_OK) { Send(new FileSystemMsg_DidWrite(request_id, bytes, complete)); if (complete) @@ -558,10 +558,10 @@ void FileAndBlobMessageFilter::DidWrite(int request_id, } } -void FileAndBlobMessageFilter::DidOpenFileSystem(int request_id, - base::PlatformFileError result, - const std::string& name, - const GURL& root) { +void FileAPIMessageFilter::DidOpenFileSystem(int request_id, + base::PlatformFileError result, + const std::string& name, + const GURL& root) { if (result == base::PLATFORM_FILE_OK) { DCHECK(root.is_valid()); Send(new FileSystemMsg_DidOpenFileSystem(request_id, name, root)); @@ -571,7 +571,7 @@ void FileAndBlobMessageFilter::DidOpenFileSystem(int request_id, // For OpenFileSystem we do not create a new operation, so no unregister here. } -void FileAndBlobMessageFilter::DidCreateSnapshot( +void FileAPIMessageFilter::DidCreateSnapshot( int request_id, const GURL& blob_url, base::PlatformFileError result, @@ -606,7 +606,7 @@ void FileAndBlobMessageFilter::DidCreateSnapshot( Send(new FileSystemMsg_DidReadMetadata(request_id, info, platform_path)); } -bool FileAndBlobMessageFilter::HasPermissionsForFile( +bool FileAPIMessageFilter::HasPermissionsForFile( const GURL& path, int permissions, base::PlatformFileError* error) { DCHECK(error); *error = base::PLATFORM_FILE_OK; @@ -644,7 +644,7 @@ bool FileAndBlobMessageFilter::HasPermissionsForFile( } -FileSystemOperationInterface* FileAndBlobMessageFilter::GetNewOperation( +FileSystemOperationInterface* FileAPIMessageFilter::GetNewOperation( const GURL& target_path, int request_id) { FileSystemOperationInterface* operation = @@ -656,7 +656,7 @@ FileSystemOperationInterface* FileAndBlobMessageFilter::GetNewOperation( return operation; } -void FileAndBlobMessageFilter::UnregisterOperation(int request_id) { +void FileAPIMessageFilter::UnregisterOperation(int request_id) { DCHECK(operations_.Lookup(request_id)); operations_.Remove(request_id); } diff --git a/content/browser/file_system/file_and_blob_message_filter.h b/content/browser/fileapi/fileapi_message_filter.h index debf356..3485204 100644 --- a/content/browser/file_system/file_and_blob_message_filter.h +++ b/content/browser/fileapi/fileapi_message_filter.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_BROWSER_FILE_SYSTEM_FILE_AND_BLOB_MESSAGE_FILTER_H_ -#define CONTENT_BROWSER_FILE_SYSTEM_FILE_AND_BLOB_MESSAGE_FILTER_H_ +#ifndef CONTENT_BROWSER_FILEAPI_FILEAPI_MESSAGE_FILTER_H_ +#define CONTENT_BROWSER_FILEAPI_FILEAPI_MESSAGE_FILTER_H_ #include <string> @@ -39,21 +39,21 @@ namespace webkit_blob { class ShareableFileReference; } -class FileAndBlobMessageFilter : public content::BrowserMessageFilter { +class FileAPIMessageFilter : public content::BrowserMessageFilter { public: // Used by the renderer process host on the UI thread. - FileAndBlobMessageFilter( + FileAPIMessageFilter( int process_id, net::URLRequestContextGetter* request_context_getter, fileapi::FileSystemContext* file_system_context, ChromeBlobStorageContext* blob_storage_context); // Used by the worker process host on the IO thread. - FileAndBlobMessageFilter( + FileAPIMessageFilter( int process_id, net::URLRequestContext* request_context, fileapi::FileSystemContext* file_system_context, ChromeBlobStorageContext* blob_storage_context); - virtual ~FileAndBlobMessageFilter(); + virtual ~FileAPIMessageFilter(); // content::BrowserMessageFilter implementation. virtual void OnChannelConnected(int32 peer_pid) OVERRIDE; @@ -175,7 +175,7 @@ class FileAndBlobMessageFilter : public content::BrowserMessageFilter { // all of them when the renderer process dies. base::hash_set<std::string> blob_urls_; - DISALLOW_COPY_AND_ASSIGN(FileAndBlobMessageFilter); + DISALLOW_COPY_AND_ASSIGN(FileAPIMessageFilter); }; -#endif // CONTENT_BROWSER_FILE_SYSTEM_FILE_AND_BLOB_MESSAGE_FILTER_H_ +#endif // CONTENT_BROWSER_FILEAPI_FILEAPI_MESSAGE_FILTER_H_ diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc index 93d306d..f91eeee 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc @@ -43,17 +43,17 @@ #include "content/browser/browser_main.h" #include "content/browser/browser_main_loop.h" #include "content/browser/child_process_security_policy_impl.h" -#include "content/browser/chrome_blob_storage_context.h" #include "content/browser/device_orientation/message_filter.h" #include "content/browser/download/mhtml_generation_manager.h" -#include "content/browser/file_system/file_and_blob_message_filter.h" +#include "content/browser/fileapi/chrome_blob_storage_context.h" +#include "content/browser/fileapi/fileapi_message_filter.h" #include "content/browser/geolocation/geolocation_dispatcher_host.h" #include "content/browser/gpu/gpu_data_manager_impl.h" #include "content/browser/gpu/gpu_process_host.h" #include "content/browser/in_process_webkit/dom_storage_context_impl.h" #include "content/browser/in_process_webkit/dom_storage_message_filter.h" -#include "content/browser/in_process_webkit/indexed_db_dispatcher_host.h" #include "content/browser/in_process_webkit/indexed_db_context_impl.h" +#include "content/browser/in_process_webkit/indexed_db_dispatcher_host.h" #include "content/browser/mime_registry_message_filter.h" #include "content/browser/plugin_service_impl.h" #include "content/browser/profiler_message_filter.h" @@ -499,7 +499,7 @@ void RenderProcessHostImpl::CreateMessageFilters() { browser_context->GetSpeechInputPreferences(), content::BrowserMainLoop::GetAudioManager())); #endif - channel_->AddFilter(new FileAndBlobMessageFilter( + channel_->AddFilter(new FileAPIMessageFilter( GetID(), browser_context->GetRequestContext(), BrowserContext::GetFileSystemContext(browser_context), diff --git a/content/browser/renderer_host/resource_dispatcher_host.cc b/content/browser/renderer_host/resource_dispatcher_host.cc index 0a6a846..452dd7b 100644 --- a/content/browser/renderer_host/resource_dispatcher_host.cc +++ b/content/browser/renderer_host/resource_dispatcher_host.cc @@ -25,12 +25,12 @@ #include "content/browser/appcache/chrome_appcache_service.h" #include "content/browser/cert_store.h" #include "content/browser/child_process_security_policy_impl.h" -#include "content/browser/chrome_blob_storage_context.h" #include "content/browser/cross_site_request_manager.h" #include "content/browser/download/download_file_manager.h" #include "content/browser/download/download_resource_handler.h" #include "content/browser/download/save_file_manager.h" #include "content/browser/download/save_file_resource_handler.h" +#include "content/browser/fileapi/chrome_blob_storage_context.h" #include "content/browser/plugin_service_impl.h" #include "content/browser/renderer_host/async_resource_handler.h" #include "content/browser/renderer_host/buffered_resource_handler.h" diff --git a/content/browser/resource_context_impl.cc b/content/browser/resource_context_impl.cc index 5660049..5a856fc 100644 --- a/content/browser/resource_context_impl.cc +++ b/content/browser/resource_context_impl.cc @@ -5,8 +5,8 @@ #include "content/browser/resource_context_impl.h" #include "content/browser/appcache/chrome_appcache_service.h" -#include "content/browser/chrome_blob_storage_context.h" -#include "content/browser/file_system/browser_file_system_helper.h" +#include "content/browser/fileapi/browser_file_system_helper.h" +#include "content/browser/fileapi/chrome_blob_storage_context.h" #include "content/browser/host_zoom_map_impl.h" #include "content/browser/in_process_webkit/indexed_db_context_impl.h" #include "content/public/browser/browser_context.h" diff --git a/content/browser/worker_host/worker_process_host.cc b/content/browser/worker_host/worker_process_host.cc index 647ee82..48c0f10 100644 --- a/content/browser/worker_host/worker_process_host.cc +++ b/content/browser/worker_host/worker_process_host.cc @@ -22,7 +22,7 @@ #include "content/browser/child_process_security_policy_impl.h" #include "content/browser/debugger/worker_devtools_manager.h" #include "content/browser/debugger/worker_devtools_message_filter.h" -#include "content/browser/file_system/file_and_blob_message_filter.h" +#include "content/browser/fileapi/fileapi_message_filter.h" #include "content/browser/in_process_webkit/indexed_db_dispatcher_host.h" #include "content/browser/mime_registry_message_filter.h" #include "content/browser/renderer_host/database_message_filter.h" @@ -262,7 +262,7 @@ void WorkerProcessHost::CreateMessageFilters(int render_process_id) { static_cast<ChromeAppCacheService*>( ResourceContext::GetAppCacheService(resource_context_)), process_->GetData().id)); - process_->GetHost()->AddFilter(new FileAndBlobMessageFilter( + process_->GetHost()->AddFilter(new FileAPIMessageFilter( process_->GetData().id, request_context, ResourceContext::GetFileSystemContext(resource_context_), diff --git a/content/common/child_thread.cc b/content/common/child_thread.cc index 39a2a4f..c4061b3 100644 --- a/content/common/child_thread.cc +++ b/content/common/child_thread.cc @@ -13,15 +13,15 @@ #include "content/common/child_process.h" #include "content/common/child_process_messages.h" #include "content/common/child_trace_message_filter.h" -#include "content/common/file_system/file_system_dispatcher.h" +#include "content/common/fileapi/file_system_dispatcher.h" #include "content/common/quota_dispatcher.h" #include "content/common/resource_dispatcher.h" #include "content/common/socket_stream_dispatcher.h" #include "content/public/common/content_switches.h" #include "ipc/ipc_logging.h" +#include "ipc/ipc_switches.h" #include "ipc/ipc_sync_channel.h" #include "ipc/ipc_sync_message_filter.h" -#include "ipc/ipc_switches.h" #include "webkit/glue/webkit_glue.h" #if defined(OS_WIN) diff --git a/content/common/content_message_generator.h b/content/common/content_message_generator.h index 0b6b89e..1e6f3c5 100644 --- a/content/common/content_message_generator.h +++ b/content/common/content_message_generator.h @@ -15,8 +15,9 @@ #include "content/common/devtools_messages.h" #include "content/common/dom_storage_messages.h" #include "content/common/drag_messages.h" -#include "content/common/file_system_messages.h" #include "content/common/file_utilities_messages.h" +#include "content/common/fileapi/file_system_messages.h" +#include "content/common/fileapi/webblob_messages.h" #include "content/common/gamepad_messages.h" #include "content/common/geolocation_messages.h" #include "content/common/gpu/gpu_messages.h" @@ -38,5 +39,4 @@ #include "content/common/text_input_client_messages.h" #include "content/common/utility_messages.h" #include "content/common/view_messages.h" -#include "content/common/webblob_messages.h" #include "content/common/worker_messages.h" diff --git a/content/browser/file_system/OWNERS b/content/common/fileapi/OWNERS index 4b079f8..f7cc33c 100644 --- a/content/browser/file_system/OWNERS +++ b/content/common/fileapi/OWNERS @@ -1,3 +1,4 @@ ericu@chromium.org kinuko@chromium.org michaeln@chromium.org +jianli@chromium.org diff --git a/content/common/file_system/file_system_dispatcher.cc b/content/common/fileapi/file_system_dispatcher.cc index 1257cba..0d2d2b9 100644 --- a/content/common/file_system/file_system_dispatcher.cc +++ b/content/common/fileapi/file_system_dispatcher.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/common/file_system/file_system_dispatcher.h" +#include "content/common/fileapi/file_system_dispatcher.h" #include "base/file_util.h" #include "base/process.h" #include "content/common/child_thread.h" -#include "content/common/file_system_messages.h" +#include "content/common/fileapi/file_system_messages.h" FileSystemDispatcher::FileSystemDispatcher() { } diff --git a/content/common/file_system/file_system_dispatcher.h b/content/common/fileapi/file_system_dispatcher.h index 7cf469f..8da0ff3 100644 --- a/content/common/file_system/file_system_dispatcher.h +++ b/content/common/fileapi/file_system_dispatcher.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_COMMON_FILE_SYSTEM_FILE_SYSTEM_DISPATCHER_H_ -#define CONTENT_COMMON_FILE_SYSTEM_FILE_SYSTEM_DISPATCHER_H_ +#ifndef CONTENT_COMMON_FILEAPI_FILE_SYSTEM_DISPATCHER_H_ +#define CONTENT_COMMON_FILEAPI_FILE_SYSTEM_DISPATCHER_H_ #include <string> #include <vector> @@ -111,4 +111,4 @@ class FileSystemDispatcher : public IPC::Channel::Listener { DISALLOW_COPY_AND_ASSIGN(FileSystemDispatcher); }; -#endif // CONTENT_COMMON_FILE_SYSTEM_FILE_SYSTEM_DISPATCHER_H_ +#endif // CONTENT_COMMON_FILEAPI_FILE_SYSTEM_DISPATCHER_H_ diff --git a/content/common/file_system_messages.h b/content/common/fileapi/file_system_messages.h index 465408d..465408d 100644 --- a/content/common/file_system_messages.h +++ b/content/common/fileapi/file_system_messages.h diff --git a/content/common/webblob_messages.h b/content/common/fileapi/webblob_messages.h index 7715454..0f4688d 100644 --- a/content/common/webblob_messages.h +++ b/content/common/fileapi/webblob_messages.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/content/common/webblobregistry_impl.cc b/content/common/fileapi/webblobregistry_impl.cc index 55f902e..924e919 100644 --- a/content/common/webblobregistry_impl.cc +++ b/content/common/fileapi/webblobregistry_impl.cc @@ -1,13 +1,13 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/common/webblobregistry_impl.h" +#include "content/common/fileapi/webblobregistry_impl.h" #include "base/memory/ref_counted.h" #include "base/shared_memory.h" #include "content/common/child_thread.h" -#include "content/common/webblob_messages.h" +#include "content/common/fileapi/webblob_messages.h" #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebBlobData.h" #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h" diff --git a/content/common/webblobregistry_impl.h b/content/common/fileapi/webblobregistry_impl.h index 4079b14..c5cb9ee 100644 --- a/content/common/webblobregistry_impl.h +++ b/content/common/fileapi/webblobregistry_impl.h @@ -1,9 +1,9 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_COMMON_WEBBLOBREGISTRY_IMPL_H_ -#define CONTENT_COMMON_WEBBLOBREGISTRY_IMPL_H_ +#ifndef CONTENT_COMMON_FILEAPI_WEBBLOBREGISTRY_IMPL_H_ +#define CONTENT_COMMON_FILEAPI_WEBBLOBREGISTRY_IMPL_H_ #pragma once #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebBlobRegistry.h" @@ -31,4 +31,4 @@ class WebBlobRegistryImpl : public WebKit::WebBlobRegistry { ChildThread* child_thread_; }; -#endif // CONTENT_COMMON_WEBBLOBREGISTRY_IMPL_H_ +#endif // CONTENT_COMMON_FILEAPI_WEBBLOBREGISTRY_IMPL_H_ diff --git a/content/common/file_system/webfilesystem_callback_dispatcher.cc b/content/common/fileapi/webfilesystem_callback_dispatcher.cc index 4ca24eb..0020f08 100644 --- a/content/common/file_system/webfilesystem_callback_dispatcher.cc +++ b/content/common/fileapi/webfilesystem_callback_dispatcher.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/common/file_system/webfilesystem_callback_dispatcher.h" +#include "content/common/fileapi/webfilesystem_callback_dispatcher.h" #include <string> #include <vector> diff --git a/content/common/file_system/webfilesystem_callback_dispatcher.h b/content/common/fileapi/webfilesystem_callback_dispatcher.h index fa951d5..ab9ed48 100644 --- a/content/common/file_system/webfilesystem_callback_dispatcher.h +++ b/content/common/fileapi/webfilesystem_callback_dispatcher.h @@ -1,9 +1,9 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_COMMON_FILE_SYSTEM_WEBFILESYSTEM_CALLBACK_DISPATCHER_H_ -#define CONTENT_COMMON_FILE_SYSTEM_WEBFILESYSTEM_CALLBACK_DISPATCHER_H_ +#ifndef CONTENT_COMMON_FILEAPI_WEBFILESYSTEM_CALLBACK_DISPATCHER_H_ +#define CONTENT_COMMON_FILEAPI_WEBFILESYSTEM_CALLBACK_DISPATCHER_H_ #include "base/basictypes.h" #include "base/platform_file.h" @@ -38,4 +38,4 @@ class WebFileSystemCallbackDispatcher WebKit::WebFileSystemCallbacks* callbacks_; }; -#endif // CONTENT_COMMON_FILE_SYSTEM_WEBFILESYSTEM_CALLBACK_DISPATCHER_H_ +#endif // CONTENT_COMMON_FILEAPI_WEBFILESYSTEM_CALLBACK_DISPATCHER_H_ diff --git a/content/common/file_system/webfilesystem_impl.cc b/content/common/fileapi/webfilesystem_impl.cc index e8f38cd..0a3f57d 100644 --- a/content/common/file_system/webfilesystem_impl.cc +++ b/content/common/fileapi/webfilesystem_impl.cc @@ -1,13 +1,13 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/common/file_system/webfilesystem_impl.h" +#include "content/common/fileapi/webfilesystem_impl.h" #include "content/common/child_thread.h" -#include "content/common/file_system/file_system_dispatcher.h" -#include "content/common/file_system/webfilesystem_callback_dispatcher.h" -#include "content/common/file_system/webfilewriter_impl.h" +#include "content/common/fileapi/file_system_dispatcher.h" +#include "content/common/fileapi/webfilesystem_callback_dispatcher.h" +#include "content/common/fileapi/webfilewriter_impl.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileInfo.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileSystemCallbacks.h" #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" diff --git a/content/common/file_system/webfilesystem_impl.h b/content/common/fileapi/webfilesystem_impl.h index 5643f35..3d4fdbb 100644 --- a/content/common/file_system/webfilesystem_impl.h +++ b/content/common/fileapi/webfilesystem_impl.h @@ -1,9 +1,9 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_COMMON_FILE_SYSTEM_WEBFILESYSTEM_IMPL_H_ -#define CONTENT_COMMON_FILE_SYSTEM_WEBFILESYSTEM_IMPL_H_ +#ifndef CONTENT_COMMON_FILEAPI_WEBFILESYSTEM_IMPL_H_ +#define CONTENT_COMMON_FILEAPI_WEBFILESYSTEM_IMPL_H_ #include "base/basictypes.h" #include "base/compiler_specific.h" @@ -63,4 +63,4 @@ class WebFileSystemImpl : public WebKit::WebFileSystem { WebKit::WebFileSystemCallbacks*) OVERRIDE; }; -#endif // CONTENT_COMMON_FILE_SYSTEM_WEBFILESYSTEM_IMPL_H_ +#endif // CONTENT_COMMON_FILEAPI_WEBFILESYSTEM_IMPL_H_ diff --git a/content/common/file_system/webfilewriter_impl.cc b/content/common/fileapi/webfilewriter_impl.cc index d42caa5..2b30f36 100644 --- a/content/common/file_system/webfilewriter_impl.cc +++ b/content/common/fileapi/webfilewriter_impl.cc @@ -1,11 +1,11 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/common/file_system/webfilewriter_impl.h" +#include "content/common/fileapi/webfilewriter_impl.h" #include "content/common/child_thread.h" -#include "content/common/file_system/file_system_dispatcher.h" +#include "content/common/fileapi/file_system_dispatcher.h" namespace { diff --git a/content/common/file_system/webfilewriter_impl.h b/content/common/fileapi/webfilewriter_impl.h index 9c9440f..f009a57 100644 --- a/content/common/file_system/webfilewriter_impl.h +++ b/content/common/fileapi/webfilewriter_impl.h @@ -1,9 +1,9 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_COMMON_FILE_SYSTEM_WEBFILEWRITER_IMPL_H_ -#define CONTENT_COMMON_FILE_SYSTEM_WEBFILEWRITER_IMPL_H_ +#ifndef CONTENT_COMMON_FILEAPI_WEBFILEWRITER_IMPL_H_ +#define CONTENT_COMMON_FILEAPI_WEBFILEWRITER_IMPL_H_ #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" @@ -28,4 +28,4 @@ class WebFileWriterImpl : public fileapi::WebFileWriterBase, int request_id_; }; -#endif // CONTENT_COMMON_FILE_SYSTEM_WEBFILEWRITER_IMPL_H_ +#endif // CONTENT_COMMON_FILEAPI_WEBFILEWRITER_IMPL_H_ diff --git a/content/content_browser.gypi b/content/content_browser.gypi index d6f984d..7c4e45d 100644 --- a/content/content_browser.gypi +++ b/content/content_browser.gypi @@ -179,8 +179,6 @@ 'browser/child_process_launcher.h', 'browser/child_process_security_policy_impl.cc', 'browser/child_process_security_policy_impl.h', - 'browser/chrome_blob_storage_context.cc', - 'browser/chrome_blob_storage_context.h', 'browser/content_ipc_logging.cc', 'browser/cross_site_request_manager.cc', 'browser/cross_site_request_manager.h', @@ -260,12 +258,14 @@ 'browser/download/save_package.h', 'browser/download/save_types.cc', 'browser/download/save_types.h', + 'browser/fileapi/browser_file_system_helper.cc', + 'browser/fileapi/browser_file_system_helper.h', + 'browser/fileapi/chrome_blob_storage_context.cc', + 'browser/fileapi/chrome_blob_storage_context.h', + 'browser/fileapi/fileapi_message_filter.cc', + 'browser/fileapi/fileapi_message_filter.h', 'browser/file_metadata_mac.h', 'browser/file_metadata_mac.mm', - 'browser/file_system/browser_file_system_helper.cc', - 'browser/file_system/browser_file_system_helper.h', - 'browser/file_system/file_and_blob_message_filter.cc', - 'browser/file_system/file_and_blob_message_filter.h', 'browser/find_pasteboard.h', 'browser/find_pasteboard.mm', 'browser/font_list_async.cc', diff --git a/content/content_common.gypi b/content/content_common.gypi index d30882c..4889f2c 100644 --- a/content/content_common.gypi +++ b/content/content_common.gypi @@ -128,15 +128,18 @@ 'common/dom_storage_messages.h', 'common/drag_messages.h', 'common/edit_command.h', - 'common/file_system/file_system_dispatcher.cc', - 'common/file_system/file_system_dispatcher.h', - 'common/file_system/webfilesystem_callback_dispatcher.cc', - 'common/file_system/webfilesystem_callback_dispatcher.h', - 'common/file_system/webfilesystem_impl.cc', - 'common/file_system/webfilesystem_impl.h', - 'common/file_system/webfilewriter_impl.cc', - 'common/file_system/webfilewriter_impl.h', - 'common/file_system_messages.h', + 'common/fileapi/file_system_dispatcher.cc', + 'common/fileapi/file_system_dispatcher.h', + 'common/fileapi/file_system_messages.h', + 'common/fileapi/webblob_messages.h', + 'common/fileapi/webblobregistry_impl.cc', + 'common/fileapi/webblobregistry_impl.h', + 'common/fileapi/webfilesystem_callback_dispatcher.cc', + 'common/fileapi/webfilesystem_callback_dispatcher.h', + 'common/fileapi/webfilesystem_impl.cc', + 'common/fileapi/webfilesystem_impl.h', + 'common/fileapi/webfilewriter_impl.cc', + 'common/fileapi/webfilewriter_impl.h', 'common/file_utilities_messages.h', 'common/font_cache_dispatcher_win.cc', 'common/font_cache_dispatcher_win.h', @@ -296,9 +299,6 @@ 'common/view_message_enums.h', 'common/web_database_observer_impl.cc', 'common/web_database_observer_impl.h', - 'common/webblobregistry_impl.cc', - 'common/webblobregistry_impl.h', - 'common/webblob_messages.h', 'common/webkitplatformsupport_impl.cc', 'common/webkitplatformsupport_impl.h', 'common/webmessageportchannel_impl.cc', diff --git a/content/renderer/pepper/pepper_plugin_delegate_impl.cc b/content/renderer/pepper/pepper_plugin_delegate_impl.cc index 187aae4..96717d5 100644 --- a/content/renderer/pepper/pepper_plugin_delegate_impl.cc +++ b/content/renderer/pepper/pepper_plugin_delegate_impl.cc @@ -20,8 +20,8 @@ #include "content/common/child_process.h" #include "content/common/child_process_messages.h" #include "content/common/child_thread.h" -#include "content/common/file_system/file_system_dispatcher.h" -#include "content/common/file_system_messages.h" +#include "content/common/fileapi/file_system_dispatcher.h" +#include "content/common/fileapi/file_system_messages.h" #include "content/common/gpu/client/content_gl_context.h" #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h" #include "content/common/pepper_file_messages.h" diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc index f560e29..0ef8d4a 100644 --- a/content/renderer/render_view_impl.cc +++ b/content/renderer/render_view_impl.cc @@ -29,8 +29,8 @@ #include "content/common/clipboard_messages.h" #include "content/common/database_messages.h" #include "content/common/drag_messages.h" -#include "content/common/file_system/file_system_dispatcher.h" -#include "content/common/file_system/webfilesystem_callback_dispatcher.h" +#include "content/common/fileapi/file_system_dispatcher.h" +#include "content/common/fileapi/webfilesystem_callback_dispatcher.h" #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h" #include "content/common/intents_messages.h" #include "content/common/java_bridge_messages.h" diff --git a/content/renderer/renderer_webkitplatformsupport_impl.cc b/content/renderer/renderer_webkitplatformsupport_impl.cc index 66d15e6..453e656 100644 --- a/content/renderer/renderer_webkitplatformsupport_impl.cc +++ b/content/renderer/renderer_webkitplatformsupport_impl.cc @@ -11,14 +11,14 @@ #include "base/shared_memory.h" #include "base/utf_string_conversions.h" #include "content/common/database_util.h" -#include "content/common/file_system/webfilesystem_impl.h" +#include "content/common/fileapi/webblobregistry_impl.h" +#include "content/common/fileapi/webfilesystem_impl.h" #include "content/common/file_utilities_messages.h" #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h" #include "content/common/indexed_db/proxy_webidbfactory_impl.h" #include "content/common/mime_registry_messages.h" #include "content/common/npobject_util.h" #include "content/common/view_messages.h" -#include "content/common/webblobregistry_impl.h" #include "content/common/webmessageportchannel_impl.h" #include "content/public/common/content_switches.h" #include "content/public/renderer/content_renderer_client.h" diff --git a/content/worker/websharedworker_stub.cc b/content/worker/websharedworker_stub.cc index 28347ea..2ff607a 100644 --- a/content/worker/websharedworker_stub.cc +++ b/content/worker/websharedworker_stub.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -6,7 +6,7 @@ #include "content/common/child_process.h" #include "content/common/child_thread.h" -#include "content/common/file_system/file_system_dispatcher.h" +#include "content/common/fileapi/file_system_dispatcher.h" #include "content/common/webmessageportchannel_impl.h" #include "content/common/worker_messages.h" #include "base/compiler_specific.h" diff --git a/content/worker/websharedworkerclient_proxy.cc b/content/worker/websharedworkerclient_proxy.cc index bcc20c2..a1ee4b4 100644 --- a/content/worker/websharedworkerclient_proxy.cc +++ b/content/worker/websharedworkerclient_proxy.cc @@ -7,8 +7,8 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/message_loop.h" -#include "content/common/file_system/file_system_dispatcher.h" -#include "content/common/file_system/webfilesystem_callback_dispatcher.h" +#include "content/common/fileapi/file_system_dispatcher.h" +#include "content/common/fileapi/webfilesystem_callback_dispatcher.h" #include "content/common/webmessageportchannel_impl.h" #include "content/common/worker_messages.h" #include "content/public/common/content_switches.h" diff --git a/content/worker/worker_webkitplatformsupport_impl.cc b/content/worker/worker_webkitplatformsupport_impl.cc index d544d4b..daa80504 100644 --- a/content/worker/worker_webkitplatformsupport_impl.cc +++ b/content/worker/worker_webkitplatformsupport_impl.cc @@ -7,11 +7,11 @@ #include "base/logging.h" #include "base/utf_string_conversions.h" #include "content/common/database_util.h" -#include "content/common/file_system/webfilesystem_impl.h" +#include "content/common/fileapi/webblobregistry_impl.h" +#include "content/common/fileapi/webfilesystem_impl.h" #include "content/common/file_utilities_messages.h" #include "content/common/indexed_db/proxy_webidbfactory_impl.h" #include "content/common/mime_registry_messages.h" -#include "content/common/webblobregistry_impl.h" #include "content/common/webmessageportchannel_impl.h" #include "content/worker/worker_thread.h" #include "ipc/ipc_sync_message_filter.h" |