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

Unified Diff: chrome/browser/sync_file_system/local_file_sync_service.cc

Issue 16109008: Cleanup: Deprecate DriveFileSyncService::kServiceName (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 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
Index: chrome/browser/sync_file_system/local_file_sync_service.cc
diff --git a/chrome/browser/sync_file_system/local_file_sync_service.cc b/chrome/browser/sync_file_system/local_file_sync_service.cc
index c67f1ccce0ad9b34bc5a22a21317d06eaa999625..7b708654b94aca4e87a9fe5d23864605349fc651 100644
--- a/chrome/browser/sync_file_system/local_file_sync_service.cc
+++ b/chrome/browser/sync_file_system/local_file_sync_service.cc
@@ -115,11 +115,10 @@ void LocalFileSyncService::Shutdown() {
void LocalFileSyncService::MaybeInitializeFileSystemContext(
const GURL& app_origin,
- const std::string& service_name,
fileapi::FileSystemContext* file_system_context,
const SyncStatusCallback& callback) {
sync_context_->MaybeInitializeFileSystemContext(
- app_origin, service_name, file_system_context,
+ app_origin, file_system_context,
base::Bind(&LocalFileSyncService::DidInitializeFileSystemContext,
AsWeakPtr(), app_origin,
make_scoped_refptr(file_system_context), callback));
@@ -189,7 +188,6 @@ void LocalFileSyncService::GetLocalFileMetadata(
void LocalFileSyncService::PrepareForProcessRemoteChange(
const FileSystemURL& url,
- const std::string& service_name,
const PrepareChangeCallback& callback) {
if (!ContainsKey(origin_to_contexts_, url.origin())) {
// This could happen if a remote sync is triggered for the app that hasn't
@@ -220,12 +218,10 @@ void LocalFileSyncService::PrepareForProcessRemoteChange(
profile_, site_url)->GetFileSystemContext();
MaybeInitializeFileSystemContext(
url.origin(),
- service_name,
file_system_context.get(),
base::Bind(&LocalFileSyncService::DidInitializeForRemoteSync,
AsWeakPtr(),
url,
- service_name,
file_system_context,
callback));
return;
@@ -327,7 +323,6 @@ void LocalFileSyncService::DidInitializeFileSystemContext(
void LocalFileSyncService::DidInitializeForRemoteSync(
const FileSystemURL& url,
- const std::string& service_name,
fileapi::FileSystemContext* file_system_context,
const PrepareChangeCallback& callback,
SyncStatusCode status) {
@@ -339,7 +334,7 @@ void LocalFileSyncService::DidInitializeForRemoteSync(
return;
}
origin_to_contexts_[url.origin()] = file_system_context;
- PrepareForProcessRemoteChange(url, service_name, callback);
+ PrepareForProcessRemoteChange(url, callback);
}
void LocalFileSyncService::RunLocalSyncCallback(

Powered by Google App Engine
This is Rietveld 408576698