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

Unified Diff: chrome/browser/sync_file_system/drive_backend/sync_engine_initializer.cc

Issue 87463002: Only re-enable remote service if the task used the network. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 1 month 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
Index: chrome/browser/sync_file_system/drive_backend/sync_engine_initializer.cc
diff --git a/chrome/browser/sync_file_system/drive_backend/sync_engine_initializer.cc b/chrome/browser/sync_file_system/drive_backend/sync_engine_initializer.cc
index d0e86031fb9bd9825aec16d0cdb6e17a3a3c2747..3c08228b950bff2be4c550f8ed6a870a53a88acb 100644
--- a/chrome/browser/sync_file_system/drive_backend/sync_engine_initializer.cc
+++ b/chrome/browser/sync_file_system/drive_backend/sync_engine_initializer.cc
@@ -139,6 +139,7 @@ void SyncEngineInitializer::DidCreateMetadataDatabase(
void SyncEngineInitializer::GetAboutResource(
const SyncStatusCallback& callback) {
+ set_used_network(true);
drive_service_->GetAboutResource(
base::Bind(&SyncEngineInitializer::DidGetAboutResource,
weak_ptr_factory_.GetWeakPtr(), callback));
@@ -168,6 +169,7 @@ void SyncEngineInitializer::FindSyncRoot(const SyncStatusCallback& callback) {
return;
}
+ set_used_network(true);
cancel_callback_ = drive_service_->SearchByTitle(
kSyncRootFolderTitle,
std::string(), // parent_folder_id
@@ -209,6 +211,7 @@ void SyncEngineInitializer::DidFindSyncRoot(
}
}
+ set_used_network(true);
// If there are more results, retrieve them.
if (GetRemainingFileList(
&cancel_callback_,
@@ -233,6 +236,7 @@ void SyncEngineInitializer::DidFindSyncRoot(
void SyncEngineInitializer::CreateSyncRoot(const SyncStatusCallback& callback) {
DCHECK(!sync_root_folder_);
+ set_used_network(true);
cancel_callback_ = drive_service_->AddNewDirectory(
root_folder_id_, kSyncRootFolderTitle,
base::Bind(&SyncEngineInitializer::DidCreateSyncRoot,
@@ -257,6 +261,7 @@ void SyncEngineInitializer::DidCreateSyncRoot(
void SyncEngineInitializer::DetachSyncRoot(const SyncStatusCallback& callback) {
DCHECK(sync_root_folder_);
+ set_used_network(true);
cancel_callback_ = drive_service_->RemoveResourceFromDirectory(
root_folder_id_, GetID(*sync_root_folder_),
base::Bind(&SyncEngineInitializer::DidDetachSyncRoot,
@@ -272,12 +277,14 @@ void SyncEngineInitializer::DidDetachSyncRoot(
callback.Run(GDataErrorCodeToSyncStatusCode(error));
return;
}
+
ListAppRootFolders(callback);
}
void SyncEngineInitializer::ListAppRootFolders(
const SyncStatusCallback& callback) {
DCHECK(sync_root_folder_);
+ set_used_network(true);
cancel_callback_ = drive_service_->GetResourceListInDirectory(
GetID(*sync_root_folder_),
base::Bind(&SyncEngineInitializer::DidListAppRootFolders,
@@ -301,6 +308,7 @@ void SyncEngineInitializer::DidListAppRootFolders(
new_entries->begin(), new_entries->end());
new_entries->weak_clear();
+ set_used_network(true);
if (GetRemainingFileList(
&cancel_callback_,
drive_service_,

Powered by Google App Engine
This is Rietveld 408576698