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

Unified Diff: chrome/browser/chromeos/gdata/gdata_system_service.cc

Issue 10640006: gdata: Stop getting GDataUploader via GDataSystemService (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 6 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/chromeos/gdata/gdata_system_service.cc
diff --git a/chrome/browser/chromeos/gdata/gdata_system_service.cc b/chrome/browser/chromeos/gdata/gdata_system_service.cc
index 3fd362ec5361b3d6d855b30f7dfb7c2da0fd3a10..2146fe00374eaea42d9b554fb8913493bb8d9467 100644
--- a/chrome/browser/chromeos/gdata/gdata_system_service.cc
+++ b/chrome/browser/chromeos/gdata/gdata_system_service.cc
@@ -34,15 +34,20 @@ GDataSystemService::GDataSystemService(Profile* profile)
BrowserThread::GetBlockingPool(),
sequence_token_)),
documents_service_(new DocumentsService),
+ uploader_(new GDataUploader(docs_service())),
file_system_(new GDataFileSystem(profile,
cache(),
docs_service(),
+ uploader(),
sequence_token_)),
- uploader_(new GDataUploader(file_system(), docs_service())),
download_observer_(new GDataDownloadObserver),
sync_client_(new GDataSyncClient(profile, file_system(), cache())),
webapps_registry_(new DriveWebAppsRegistry) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+
+ // TODO(satorux): The dependency to GDataFileSystem should be
+ // eliminated. http://crbug.com/133860
+ uploader_->set_file_system(file_system());
}
GDataSystemService::~GDataSystemService() {

Powered by Google App Engine
This is Rietveld 408576698