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

Unified Diff: chrome/browser/google_apis/base_operations.cc

Issue 15333013: Replace most of the occurrence of OperationRegistry with OperationRunner. (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/google_apis/base_operations.cc
diff --git a/chrome/browser/google_apis/base_operations.cc b/chrome/browser/google_apis/base_operations.cc
index cd89ad6e4075e5a72139d26677f79bbc31f9755f..2469ccba584389f65c83e715adcca085182d9435 100644
--- a/chrome/browser/google_apis/base_operations.cc
+++ b/chrome/browser/google_apis/base_operations.cc
@@ -10,6 +10,7 @@
#include "base/task_runner_util.h"
#include "base/threading/sequenced_worker_pool.h"
#include "base/values.h"
+#include "chrome/browser/google_apis/operation_runner.h"
#include "content/public/browser/browser_thread.h"
#include "net/base/load_flags.h"
#include "net/base/net_errors.h"
@@ -92,9 +93,9 @@ void ParseJson(const std::string& json, const ParseJsonCallback& callback) {
//============================ UrlFetchOperationBase ===========================
UrlFetchOperationBase::UrlFetchOperationBase(
- OperationRegistry* registry,
+ OperationRunner* runner,
net::URLRequestContextGetter* url_request_context_getter)
- : OperationRegistry::Operation(registry),
+ : OperationRegistry::Operation(runner->operation_registry()),
url_request_context_getter_(url_request_context_getter),
re_authenticate_count_(0),
started_(false),
@@ -104,10 +105,10 @@ UrlFetchOperationBase::UrlFetchOperationBase(
}
UrlFetchOperationBase::UrlFetchOperationBase(
- OperationRegistry* registry,
+ OperationRunner* runner,
net::URLRequestContextGetter* url_request_context_getter,
const base::FilePath& path)
- : OperationRegistry::Operation(registry, path),
+ : OperationRegistry::Operation(runner->operation_registry(), path),
url_request_context_getter_(url_request_context_getter),
re_authenticate_count_(0),
started_(false),
@@ -308,10 +309,10 @@ UrlFetchOperationBase::GetWeakPtr() {
//============================ EntryActionOperation ============================
EntryActionOperation::EntryActionOperation(
- OperationRegistry* registry,
+ OperationRunner* runner,
net::URLRequestContextGetter* url_request_context_getter,
const EntryActionCallback& callback)
- : UrlFetchOperationBase(registry, url_request_context_getter),
+ : UrlFetchOperationBase(runner, url_request_context_getter),
callback_(callback) {
DCHECK(!callback_.is_null());
}
@@ -332,10 +333,10 @@ void EntryActionOperation::RunCallbackOnPrematureFailure(GDataErrorCode code) {
//============================== GetDataOperation ==============================
GetDataOperation::GetDataOperation(
- OperationRegistry* registry,
+ OperationRunner* runner,
net::URLRequestContextGetter* url_request_context_getter,
const GetDataCallback& callback)
- : UrlFetchOperationBase(registry, url_request_context_getter),
+ : UrlFetchOperationBase(runner, url_request_context_getter),
callback_(callback),
weak_ptr_factory_(this) {
DCHECK(!callback_.is_null());
@@ -405,13 +406,13 @@ void GetDataOperation::RunCallbackOnSuccess(GDataErrorCode fetch_error_code,
//========================= InitiateUploadOperationBase ========================
InitiateUploadOperationBase::InitiateUploadOperationBase(
- OperationRegistry* registry,
+ OperationRunner* runner,
net::URLRequestContextGetter* url_request_context_getter,
const InitiateUploadCallback& callback,
const base::FilePath& drive_file_path,
const std::string& content_type,
int64 content_length)
- : UrlFetchOperationBase(registry,
+ : UrlFetchOperationBase(runner,
url_request_context_getter,
drive_file_path),
callback_(callback),
@@ -484,11 +485,11 @@ UploadRangeResponse::~UploadRangeResponse() {
//========================== UploadRangeOperationBase ==========================
UploadRangeOperationBase::UploadRangeOperationBase(
- OperationRegistry* registry,
+ OperationRunner* runner,
net::URLRequestContextGetter* url_request_context_getter,
const base::FilePath& drive_file_path,
const GURL& upload_url)
- : UrlFetchOperationBase(registry,
+ : UrlFetchOperationBase(runner,
url_request_context_getter,
drive_file_path),
drive_file_path_(drive_file_path),
@@ -595,7 +596,7 @@ void UploadRangeOperationBase::RunCallbackOnPrematureFailure(
//========================== ResumeUploadOperationBase =========================
ResumeUploadOperationBase::ResumeUploadOperationBase(
- OperationRegistry* registry,
+ OperationRunner* runner,
net::URLRequestContextGetter* url_request_context_getter,
const base::FilePath& drive_file_path,
const GURL& upload_location,
@@ -604,7 +605,7 @@ ResumeUploadOperationBase::ResumeUploadOperationBase(
int64 content_length,
const std::string& content_type,
const base::FilePath& local_file_path)
- : UploadRangeOperationBase(registry,
+ : UploadRangeOperationBase(runner,
url_request_context_getter,
drive_file_path,
upload_location),
@@ -669,12 +670,12 @@ void ResumeUploadOperationBase::NotifyStartToOperationRegistry() {
//======================== GetUploadStatusOperationBase ========================
GetUploadStatusOperationBase::GetUploadStatusOperationBase(
- OperationRegistry* registry,
+ OperationRunner* runner,
net::URLRequestContextGetter* url_request_context_getter,
const base::FilePath& drive_file_path,
const GURL& upload_url,
int64 content_length)
- : UploadRangeOperationBase(registry,
+ : UploadRangeOperationBase(runner,
url_request_context_getter,
drive_file_path,
upload_url),
@@ -700,7 +701,7 @@ GetUploadStatusOperationBase::GetExtraRequestHeaders() const {
//============================ DownloadFileOperation ===========================
DownloadFileOperation::DownloadFileOperation(
- OperationRegistry* registry,
+ OperationRunner* runner,
net::URLRequestContextGetter* url_request_context_getter,
const DownloadActionCallback& download_action_callback,
const GetContentCallback& get_content_callback,
@@ -708,7 +709,7 @@ DownloadFileOperation::DownloadFileOperation(
const GURL& download_url,
const base::FilePath& drive_file_path,
const base::FilePath& output_file_path)
- : UrlFetchOperationBase(registry,
+ : UrlFetchOperationBase(runner,
url_request_context_getter,
drive_file_path),
download_action_callback_(download_action_callback),
« no previous file with comments | « chrome/browser/google_apis/base_operations.h ('k') | chrome/browser/google_apis/base_operations_server_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698