Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2051)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/extensions/api/sync_file_system/sync_file_system_api.cc

Issue 492873002: Collapse fileapi, webkit_blob, webkit_database, quota, and webkit_common namespaces into single sto… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix chromeos build Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/extensions/api/sync_file_system/sync_file_system_api.h ('k') | chrome/browser/extensions/api/sync_file_system/sync_file_system_api_helpers.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/api/sync_file_system/sync_file_system_api.cc
diff --git a/chrome/browser/extensions/api/sync_file_system/sync_file_system_api.cc b/chrome/browser/extensions/api/sync_file_system/sync_file_system_api.cc
index 5a8177ef29e0c0c2531303290ac790571fd5c198..6181124f5d4c1661e5250b52a2693daf7f331cbd 100644
--- a/chrome/browser/extensions/api/sync_file_system/sync_file_system_api.cc
+++ b/chrome/browser/extensions/api/sync_file_system/sync_file_system_api.cc
@@ -68,17 +68,17 @@ bool SyncFileSystemDeleteFileSystemFunction::RunAsync() {
std::string url;
EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &url));
- scoped_refptr<fileapi::FileSystemContext> file_system_context =
+ scoped_refptr<storage::FileSystemContext> file_system_context =
BrowserContext::GetStoragePartition(GetProfile(),
render_view_host()->GetSiteInstance())
->GetFileSystemContext();
- fileapi::FileSystemURL file_system_url(
+ storage::FileSystemURL file_system_url(
file_system_context->CrackURL(GURL(url)));
BrowserThread::PostTask(
BrowserThread::IO,
FROM_HERE,
- Bind(&fileapi::FileSystemContext::DeleteFileSystem,
+ Bind(&storage::FileSystemContext::DeleteFileSystem,
file_system_context,
source_url().GetOrigin(),
file_system_url.type(),
@@ -120,18 +120,18 @@ bool SyncFileSystemRequestFileSystemFunction::RunAsync() {
// Initializes sync context for this extension and continue to open
// a new file system.
- BrowserThread::PostTask(
- BrowserThread::IO, FROM_HERE,
- Bind(&fileapi::FileSystemContext::OpenFileSystem,
- GetFileSystemContext(),
- source_url().GetOrigin(),
- fileapi::kFileSystemTypeSyncable,
- fileapi::OPEN_FILE_SYSTEM_CREATE_IF_NONEXISTENT,
- base::Bind(&self::DidOpenFileSystem, this)));
+ BrowserThread::PostTask(BrowserThread::IO,
+ FROM_HERE,
+ Bind(&storage::FileSystemContext::OpenFileSystem,
+ GetFileSystemContext(),
+ source_url().GetOrigin(),
+ storage::kFileSystemTypeSyncable,
+ storage::OPEN_FILE_SYSTEM_CREATE_IF_NONEXISTENT,
+ base::Bind(&self::DidOpenFileSystem, this)));
return true;
}
-fileapi::FileSystemContext*
+storage::FileSystemContext*
SyncFileSystemRequestFileSystemFunction::GetFileSystemContext() {
DCHECK(render_view_host());
return BrowserContext::GetStoragePartition(
@@ -171,11 +171,11 @@ bool SyncFileSystemGetFileStatusFunction::RunAsync() {
std::string url;
EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &url));
- scoped_refptr<fileapi::FileSystemContext> file_system_context =
+ scoped_refptr<storage::FileSystemContext> file_system_context =
BrowserContext::GetStoragePartition(GetProfile(),
render_view_host()->GetSiteInstance())
->GetFileSystemContext();
- fileapi::FileSystemURL file_system_url(
+ storage::FileSystemURL file_system_url(
file_system_context->CrackURL(GURL(url)));
GetSyncFileSystemService(GetProfile())->GetFileSyncStatus(
@@ -211,7 +211,7 @@ bool SyncFileSystemGetFileStatusesFunction::RunAsync() {
base::ListValue* file_entry_urls = NULL;
EXTENSION_FUNCTION_VALIDATE(args_->GetList(0, &file_entry_urls));
- scoped_refptr<fileapi::FileSystemContext> file_system_context =
+ scoped_refptr<storage::FileSystemContext> file_system_context =
BrowserContext::GetStoragePartition(GetProfile(),
render_view_host()->GetSiteInstance())
->GetFileSystemContext();
@@ -226,7 +226,7 @@ bool SyncFileSystemGetFileStatusesFunction::RunAsync() {
for (unsigned int i = 0; i < num_expected_results_; i++) {
std::string url;
file_entry_urls->GetString(i, &url);
- fileapi::FileSystemURL file_system_url(
+ storage::FileSystemURL file_system_url(
file_system_context->CrackURL(GURL(url)));
sync_file_system_service->GetFileSyncStatus(
@@ -239,7 +239,7 @@ bool SyncFileSystemGetFileStatusesFunction::RunAsync() {
}
void SyncFileSystemGetFileStatusesFunction::DidGetFileStatus(
- const fileapi::FileSystemURL& file_system_url,
+ const storage::FileSystemURL& file_system_url,
SyncStatusCode sync_status_code,
SyncFileStatus sync_file_status) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ -265,7 +265,7 @@ void SyncFileSystemGetFileStatusesFunction::DidGetFileStatus(
base::DictionaryValue* dict = new base::DictionaryValue();
status_array->Append(dict);
- fileapi::FileSystemURL url = it->first;
+ storage::FileSystemURL url = it->first;
SyncStatusCode file_error = it->second.first;
api::sync_file_system::FileStatus file_status =
SyncFileStatusToExtensionEnum(it->second.second);
@@ -287,14 +287,14 @@ bool SyncFileSystemGetUsageAndQuotaFunction::RunAsync() {
std::string url;
EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &url));
- scoped_refptr<fileapi::FileSystemContext> file_system_context =
+ scoped_refptr<storage::FileSystemContext> file_system_context =
BrowserContext::GetStoragePartition(GetProfile(),
render_view_host()->GetSiteInstance())
->GetFileSystemContext();
- fileapi::FileSystemURL file_system_url(
+ storage::FileSystemURL file_system_url(
file_system_context->CrackURL(GURL(url)));
- scoped_refptr<quota::QuotaManager> quota_manager =
+ scoped_refptr<storage::QuotaManager> quota_manager =
BrowserContext::GetStoragePartition(GetProfile(),
render_view_host()->GetSiteInstance())
->GetQuotaManager();
@@ -302,10 +302,10 @@ bool SyncFileSystemGetUsageAndQuotaFunction::RunAsync() {
BrowserThread::PostTask(
BrowserThread::IO,
FROM_HERE,
- Bind(&quota::QuotaManager::GetUsageAndQuotaForWebApps,
+ Bind(&storage::QuotaManager::GetUsageAndQuotaForWebApps,
quota_manager,
source_url().GetOrigin(),
- fileapi::FileSystemTypeToQuotaStorageType(file_system_url.type()),
+ storage::FileSystemTypeToQuotaStorageType(file_system_url.type()),
Bind(&SyncFileSystemGetUsageAndQuotaFunction::DidGetUsageAndQuota,
this)));
@@ -313,7 +313,9 @@ bool SyncFileSystemGetUsageAndQuotaFunction::RunAsync() {
}
void SyncFileSystemGetUsageAndQuotaFunction::DidGetUsageAndQuota(
- quota::QuotaStatusCode status, int64 usage, int64 quota) {
+ storage::QuotaStatusCode status,
+ int64 usage,
+ int64 quota) {
// Repost to switch from IO thread to UI thread for SendResponse().
if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
DCHECK_CURRENTLY_ON(BrowserThread::IO);
@@ -326,7 +328,7 @@ void SyncFileSystemGetUsageAndQuotaFunction::DidGetUsageAndQuota(
}
DCHECK_CURRENTLY_ON(BrowserThread::UI);
- if (status != quota::kQuotaStatusOk) {
+ if (status != storage::kQuotaStatusOk) {
error_ = QuotaStatusCodeToString(status);
SendResponse(false);
return;
« no previous file with comments | « chrome/browser/extensions/api/sync_file_system/sync_file_system_api.h ('k') | chrome/browser/extensions/api/sync_file_system/sync_file_system_api_helpers.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698