chrome/browser/chromeos/gdata/gdata_system_service.cc - Issue 10759007: gdata: Move GDataFileSystem::AddUploadedFile() call out of uploader and into GDataDownloadObserver.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 10759007: gdata: Move GDataFileSystem::AddUploadedFile() call out of uploader and into GDataDownloadObserver. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Comments for Patch #10. Created 8 years, 5 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

« chrome/browser/chromeos/gdata/gdata_download_observer.cc ('K') | « chrome/browser/chromeos/gdata/gdata_download_observer.cc ('k') | chrome/browser/chromeos/gdata/gdata_uploader.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 fd7f7f14e9fd9a7b98c47d5d3d916b020acfefec..cf4ae4337146a0ddb3b5d1b88e50f9b633324be5 100644

--- a/chrome/browser/chromeos/gdata/gdata_system_service.cc

+++ b/chrome/browser/chromeos/gdata/gdata_system_service.cc

@@ -46,7 +46,7 @@ GDataSystemService::GDataSystemService(Profile* profile)

uploader(),

webapps_registry(),

sequence_token_)),

- download_observer_(new GDataDownloadObserver),

+ download_observer_(new GDataDownloadObserver(uploader(), file_system())),

sync_client_(new GDataSyncClient(profile, file_system(), cache())) {

DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));

@@ -71,7 +71,6 @@ void GDataSystemService::Initialize() {

g_browser_process->download_status_updater() ?

BrowserContext::GetDownloadManager(profile_) : NULL;

download_observer_->Initialize(

- uploader_.get(),

download_manager,

cache_->GetCacheDirectoryPath(

GDataCache::CACHE_TYPE_TMP_DOWNLOADS));