Index: android_webview/browser/aw_quota_manager_bridge_impl.cc |
diff --git a/android_webview/native/aw_quota_manager_bridge_impl.cc b/android_webview/browser/aw_quota_manager_bridge_impl.cc |
similarity index 82% |
rename from android_webview/native/aw_quota_manager_bridge_impl.cc |
rename to android_webview/browser/aw_quota_manager_bridge_impl.cc |
index 85d45b642835a2563a1825215297e1594cd67982..b4bdc5820267b1618bba2e2a76adde232f28e838 100644 |
--- a/android_webview/native/aw_quota_manager_bridge_impl.cc |
+++ b/android_webview/browser/aw_quota_manager_bridge_impl.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 "android_webview/native/aw_quota_manager_bridge_impl.h" |
+#include "android_webview/browser/aw_quota_manager_bridge_impl.h" |
#include <set> |
@@ -37,9 +37,8 @@ namespace { |
// are destroyed at the end of DoneOnUIThread. |
class GetOriginsTask : public base::RefCountedThreadSafe<GetOriginsTask> { |
public: |
- GetOriginsTask( |
- const AwQuotaManagerBridgeImpl::GetOriginsCallback& callback, |
- QuotaManager* quota_manager); |
+ GetOriginsTask(const AwQuotaManagerBridgeImpl::GetOriginsCallback& callback, |
+ QuotaManager* quota_manager); |
void Run(); |
@@ -74,8 +73,7 @@ class GetOriginsTask : public base::RefCountedThreadSafe<GetOriginsTask> { |
GetOriginsTask::GetOriginsTask( |
const AwQuotaManagerBridgeImpl::GetOriginsCallback& callback, |
QuotaManager* quota_manager) |
- : ui_callback_(callback), |
- quota_manager_(quota_manager) { |
+ : ui_callback_(callback), quota_manager_(quota_manager) { |
DCHECK_CURRENTLY_ON(BrowserThread::UI); |
} |
@@ -84,10 +82,8 @@ GetOriginsTask::~GetOriginsTask() {} |
void GetOriginsTask::Run() { |
DCHECK_CURRENTLY_ON(BrowserThread::UI); |
BrowserThread::PostTask( |
- BrowserThread::IO, |
- FROM_HERE, |
- base::Bind(&QuotaManager::GetOriginsModifiedSince, |
- quota_manager_, |
+ BrowserThread::IO, FROM_HERE, |
+ base::Bind(&QuotaManager::GetOriginsModifiedSince, quota_manager_, |
storage::kStorageTypeTemporary, |
base::Time() /* Since beginning of time. */, |
base::Bind(&GetOriginsTask::OnOriginsObtained, this))); |
@@ -100,11 +96,9 @@ void GetOriginsTask::OnOriginsObtained(const std::set<GURL>& origins, |
num_callbacks_received_ = 0u; |
for (std::set<GURL>::const_iterator origin = origins.begin(); |
- origin != origins.end(); |
- ++origin) { |
+ origin != origins.end(); ++origin) { |
quota_manager_->GetUsageAndQuota( |
- *origin, |
- type, |
+ *origin, type, |
base::Bind(&GetOriginsTask::OnUsageAndQuotaObtained, this, *origin)); |
} |
@@ -130,10 +124,8 @@ void GetOriginsTask::OnUsageAndQuotaObtained( |
void GetOriginsTask::CheckDone() { |
DCHECK_CURRENTLY_ON(BrowserThread::IO); |
if (num_callbacks_received_ == num_callbacks_to_wait_) { |
- BrowserThread::PostTask( |
- BrowserThread::UI, |
- FROM_HERE, |
- base::Bind(&GetOriginsTask::DoneOnUIThread, this)); |
+ BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, |
+ base::Bind(&GetOriginsTask::DoneOnUIThread, this)); |
} else if (num_callbacks_received_ > num_callbacks_to_wait_) { |
NOTREACHED(); |
} |
@@ -155,7 +147,6 @@ void RunOnUIThread(const base::Closure& task) { |
} // namespace |
- |
// static |
jlong GetDefaultNativeAwQuotaManagerBridge(JNIEnv* env, |
const JavaParamRef<jclass>& clazz) { |
@@ -176,9 +167,7 @@ scoped_refptr<AwQuotaManagerBridge> AwQuotaManagerBridgeImpl::Create( |
AwQuotaManagerBridgeImpl::AwQuotaManagerBridgeImpl( |
AwBrowserContext* browser_context) |
- : browser_context_(browser_context), |
- weak_factory_(this) { |
-} |
+ : browser_context_(browser_context), weak_factory_(this) {} |
AwQuotaManagerBridgeImpl::~AwQuotaManagerBridgeImpl() {} |
@@ -208,8 +197,8 @@ QuotaManager* AwQuotaManagerBridgeImpl::GetQuotaManager() const { |
void AwQuotaManagerBridgeImpl::DeleteAllData( |
JNIEnv* env, |
const JavaParamRef<jobject>& object) { |
- RunOnUIThread(base::Bind(&AwQuotaManagerBridgeImpl::DeleteAllDataOnUiThread, |
- this)); |
+ RunOnUIThread( |
+ base::Bind(&AwQuotaManagerBridgeImpl::DeleteAllDataOnUiThread, this)); |
} |
void AwQuotaManagerBridgeImpl::DeleteAllDataOnUiThread() { |
@@ -221,9 +210,9 @@ void AwQuotaManagerBridgeImpl::DeleteAllDataOnUiThread() { |
StoragePartition::REMOVE_DATA_MASK_INDEXEDDB | |
StoragePartition::REMOVE_DATA_MASK_LOCAL_STORAGE | |
StoragePartition::REMOVE_DATA_MASK_WEBSQL, |
- StoragePartition::QUOTA_MANAGED_STORAGE_MASK_TEMPORARY, |
- GURL(), StoragePartition::OriginMatcherFunction(), |
- base::Time(), base::Time::Max(), base::Bind(&base::DoNothing)); |
+ StoragePartition::QUOTA_MANAGED_STORAGE_MASK_TEMPORARY, GURL(), |
+ StoragePartition::OriginMatcherFunction(), base::Time(), |
+ base::Time::Max(), base::Bind(&base::DoNothing)); |
} |
void AwQuotaManagerBridgeImpl::DeleteOrigin( |
@@ -233,8 +222,7 @@ void AwQuotaManagerBridgeImpl::DeleteOrigin( |
base::string16 origin_string( |
base::android::ConvertJavaStringToUTF16(env, origin)); |
RunOnUIThread(base::Bind(&AwQuotaManagerBridgeImpl::DeleteOriginOnUiThread, |
- this, |
- origin_string)); |
+ this, origin_string)); |
} |
void AwQuotaManagerBridgeImpl::DeleteOriginOnUiThread( |
@@ -247,27 +235,23 @@ void AwQuotaManagerBridgeImpl::DeleteOriginOnUiThread( |
StoragePartition::REMOVE_DATA_MASK_FILE_SYSTEMS | |
StoragePartition::REMOVE_DATA_MASK_INDEXEDDB | |
StoragePartition::REMOVE_DATA_MASK_WEBSQL, |
- StoragePartition::QUOTA_MANAGED_STORAGE_MASK_TEMPORARY, |
- GURL(origin), |
- storage_partition->GetURLRequestContext(), |
- base::Bind(&base::DoNothing)); |
+ StoragePartition::QUOTA_MANAGED_STORAGE_MASK_TEMPORARY, GURL(origin), |
+ storage_partition->GetURLRequestContext(), base::Bind(&base::DoNothing)); |
} |
void AwQuotaManagerBridgeImpl::GetOrigins(JNIEnv* env, |
const JavaParamRef<jobject>& object, |
jint callback_id) { |
RunOnUIThread(base::Bind(&AwQuotaManagerBridgeImpl::GetOriginsOnUiThread, |
- this, |
- callback_id)); |
+ this, callback_id)); |
} |
void AwQuotaManagerBridgeImpl::GetOriginsOnUiThread(jint callback_id) { |
DCHECK_CURRENTLY_ON(BrowserThread::UI); |
- const GetOriginsCallback ui_callback = base::Bind( |
- &AwQuotaManagerBridgeImpl::GetOriginsCallbackImpl, |
- weak_factory_.GetWeakPtr(), |
- callback_id); |
+ const GetOriginsCallback ui_callback = |
+ base::Bind(&AwQuotaManagerBridgeImpl::GetOriginsCallbackImpl, |
+ weak_factory_.GetWeakPtr(), callback_id); |
(new GetOriginsTask(ui_callback, GetQuotaManager()))->Run(); |
} |
@@ -301,13 +285,11 @@ void OnUsageAndQuotaObtained( |
usage = 0; |
quota = 0; |
} |
- BrowserThread::PostTask( |
- BrowserThread::UI, |
- FROM_HERE, |
- base::Bind(ui_callback, usage, quota)); |
+ BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, |
+ base::Bind(ui_callback, usage, quota)); |
} |
-} // namespace |
+} // namespace |
void AwQuotaManagerBridgeImpl::GetUsageAndQuotaForOrigin( |
JNIEnv* env, |
@@ -317,12 +299,9 @@ void AwQuotaManagerBridgeImpl::GetUsageAndQuotaForOrigin( |
bool is_quota) { |
base::string16 origin_string( |
base::android::ConvertJavaStringToUTF16(env, origin)); |
- RunOnUIThread(base::Bind( |
- &AwQuotaManagerBridgeImpl::GetUsageAndQuotaForOriginOnUiThread, |
- this, |
- origin_string, |
- callback_id, |
- is_quota)); |
+ RunOnUIThread( |
+ base::Bind(&AwQuotaManagerBridgeImpl::GetUsageAndQuotaForOriginOnUiThread, |
+ this, origin_string, callback_id, is_quota)); |
} |
void AwQuotaManagerBridgeImpl::GetUsageAndQuotaForOriginOnUiThread( |
@@ -330,19 +309,14 @@ void AwQuotaManagerBridgeImpl::GetUsageAndQuotaForOriginOnUiThread( |
jint callback_id, |
bool is_quota) { |
DCHECK_CURRENTLY_ON(BrowserThread::UI); |
- const QuotaUsageCallback ui_callback = base::Bind( |
- &AwQuotaManagerBridgeImpl::QuotaUsageCallbackImpl, |
- weak_factory_.GetWeakPtr(), |
- callback_id, |
- is_quota); |
+ const QuotaUsageCallback ui_callback = |
+ base::Bind(&AwQuotaManagerBridgeImpl::QuotaUsageCallbackImpl, |
+ weak_factory_.GetWeakPtr(), callback_id, is_quota); |
BrowserThread::PostTask( |
- BrowserThread::IO, |
- FROM_HERE, |
- base::Bind(&QuotaManager::GetUsageAndQuota, |
- GetQuotaManager(), |
- GURL(origin), |
- storage::kStorageTypeTemporary, |
+ BrowserThread::IO, FROM_HERE, |
+ base::Bind(&QuotaManager::GetUsageAndQuota, GetQuotaManager(), |
+ GURL(origin), storage::kStorageTypeTemporary, |
base::Bind(&OnUsageAndQuotaObtained, ui_callback))); |
} |