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

Unified Diff: chrome/browser/chromeos/drive/drive_file_system.cc

Issue 13448003: Narrow the ownership of DriveUploader from DriveSystemService to DriveScheduler. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Created 7 years, 9 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/drive/drive_file_system.cc
diff --git a/chrome/browser/chromeos/drive/drive_file_system.cc b/chrome/browser/chromeos/drive/drive_file_system.cc
index 13062999437ef9eeeb85cef473498d0c3e31ce55..9f79cb20affe73fe97191f3350b5edd0953e2323 100644
--- a/chrome/browser/chromeos/drive/drive_file_system.cc
+++ b/chrome/browser/chromeos/drive/drive_file_system.cc
@@ -27,7 +27,6 @@
#include "chrome/browser/google_apis/drive_api_parser.h"
#include "chrome/browser/google_apis/drive_api_util.h"
#include "chrome/browser/google_apis/drive_service_interface.h"
-#include "chrome/browser/google_apis/drive_uploader.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/common/chrome_notification_types.h"
#include "chrome/common/pref_names.h"
@@ -220,13 +219,11 @@ DriveFileSystem::DriveFileSystem(
Profile* profile,
DriveCache* cache,
google_apis::DriveServiceInterface* drive_service,
- google_apis::DriveUploaderInterface* uploader,
DriveWebAppsRegistry* webapps_registry,
DriveResourceMetadata* resource_metadata,
base::SequencedTaskRunner* blocking_task_runner)
: profile_(profile),
cache_(cache),
- uploader_(uploader),
drive_service_(drive_service),
webapps_registry_(webapps_registry),
resource_metadata_(resource_metadata),
@@ -234,7 +231,7 @@ DriveFileSystem::DriveFileSystem(
last_update_check_error_(DRIVE_FILE_OK),
hide_hosted_docs_(false),
blocking_task_runner_(blocking_task_runner),
- scheduler_(new DriveScheduler(profile, drive_service, uploader)),
+ scheduler_(new DriveScheduler(profile, drive_service)),
polling_interval_sec_(kFastPollingIntervalInSec),
push_notification_enabled_(false),
ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) {
@@ -257,7 +254,6 @@ void DriveFileSystem::Initialize() {
this, // DriveFileSystemInterface
cache_,
resource_metadata_,
- uploader_,
blocking_task_runner_,
this); // OperationObserver
« no previous file with comments | « chrome/browser/chromeos/drive/drive_file_system.h ('k') | chrome/browser/chromeos/drive/drive_file_system_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698