diff options
author | michaeln@google.com <michaeln@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-29 03:09:43 +0000 |
---|---|---|
committer | michaeln@google.com <michaeln@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-29 03:09:43 +0000 |
commit | b76b556d6c09aaa3f52755d765e50446fe800520 (patch) | |
tree | 9a57d757f02079112522f8510d487802d78b027a /content/browser/fileapi | |
parent | 272279c609dd750e5e84ebe0bac21f1e877e49c2 (diff) | |
download | chromium_src-b76b556d6c09aaa3f52755d765e50446fe800520.zip chromium_src-b76b556d6c09aaa3f52755d765e50446fe800520.tar.gz chromium_src-b76b556d6c09aaa3f52755d765e50446fe800520.tar.bz2 |
Move webkit/blob to new locations. Also move content::WebBlobRegistryImpl to the new common_child library.
- just moving the files in the source repository
- and fixing up complilation guards
- and fixing up include paths throughout
- and fixing up DEPs files as needed
Note: Everything in /webkit is still being built into the same old webkit_storage target
for now, new actual build target(s) will come later.
TBR=kinuko@chromium.org, thestig@chromium.org
BUG=239109
Review URL: https://codereview.chromium.org/15746017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202762 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/fileapi')
-rw-r--r-- | content/browser/fileapi/chrome_blob_storage_context.cc | 2 | ||||
-rw-r--r-- | content/browser/fileapi/fileapi_message_filter.cc | 6 | ||||
-rw-r--r-- | content/browser/fileapi/fileapi_message_filter.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/content/browser/fileapi/chrome_blob_storage_context.cc b/content/browser/fileapi/chrome_blob_storage_context.cc index 6d04408..6679e2c 100644 --- a/content/browser/fileapi/chrome_blob_storage_context.cc +++ b/content/browser/fileapi/chrome_blob_storage_context.cc @@ -7,7 +7,7 @@ #include "base/bind.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h" -#include "webkit/blob/blob_storage_controller.h" +#include "webkit/browser/blob/blob_storage_controller.h" using base::UserDataAdapter; using webkit_blob::BlobStorageController; diff --git a/content/browser/fileapi/fileapi_message_filter.cc b/content/browser/fileapi/fileapi_message_filter.cc index 3546282..1627ddd 100644 --- a/content/browser/fileapi/fileapi_message_filter.cc +++ b/content/browser/fileapi/fileapi_message_filter.cc @@ -24,15 +24,15 @@ #include "net/base/mime_util.h" #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context_getter.h" -#include "webkit/blob/blob_data.h" -#include "webkit/blob/blob_storage_controller.h" -#include "webkit/blob/shareable_file_reference.h" +#include "webkit/browser/blob/blob_storage_controller.h" #include "webkit/browser/fileapi/file_observers.h" #include "webkit/browser/fileapi/file_permission_policy.h" #include "webkit/browser/fileapi/file_system_context.h" #include "webkit/browser/fileapi/isolated_context.h" #include "webkit/browser/fileapi/local_file_system_operation.h" #include "webkit/browser/fileapi/sandbox_mount_point_provider.h" +#include "webkit/common/blob/blob_data.h" +#include "webkit/common/blob/shareable_file_reference.h" #include "webkit/common/fileapi/directory_entry.h" #include "webkit/common/fileapi/file_system_types.h" #include "webkit/common/fileapi/file_system_util.h" diff --git a/content/browser/fileapi/fileapi_message_filter.h b/content/browser/fileapi/fileapi_message_filter.h index ac3317b..d1576cd0 100644 --- a/content/browser/fileapi/fileapi_message_filter.h +++ b/content/browser/fileapi/fileapi_message_filter.h @@ -16,7 +16,7 @@ #include "base/platform_file.h" #include "base/shared_memory.h" #include "content/public/browser/browser_message_filter.h" -#include "webkit/blob/blob_data.h" +#include "webkit/common/blob/blob_data.h" #include "webkit/common/fileapi/file_system_types.h" #include "webkit/quota/quota_types.h" |