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

Unified Diff: chrome/browser/chromeos/gdata/operations_base.h

Issue 10836011: Revert 148990 - gdrive: Get JSON feeds parsing off the UI thread. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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
Index: chrome/browser/chromeos/gdata/operations_base.h
===================================================================
--- chrome/browser/chromeos/gdata/operations_base.h (revision 148995)
+++ chrome/browser/chromeos/gdata/operations_base.h (working copy)
@@ -112,7 +112,7 @@
// Invoked by OnURLFetchComplete when the operation completes without an
// authentication error. Must be implemented by a derived class.
- virtual void ProcessURLFetchResults(const net::URLFetcher* source) = 0;
+ virtual bool ProcessURLFetchResults(const net::URLFetcher* source) = 0;
// Invoked when it needs to notify the status. Chunked operations that
// constructs a logically single operation from multiple physical operations
@@ -130,9 +130,6 @@
// Overridden from URLFetcherDelegate.
virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
- // Invoked when ProcessURLFetchResults() is completed.
- virtual void OnProcessURLFetchResultsComplete(bool result) OVERRIDE;
-
// Overridden from GDataOperationInterface.
virtual void OnAuthFailed(GDataErrorCode code) OVERRIDE;
@@ -166,7 +163,7 @@
protected:
// Overridden from UrlFetchOperationBase.
- virtual void ProcessURLFetchResults(const net::URLFetcher* source) OVERRIDE;
+ virtual bool ProcessURLFetchResults(const net::URLFetcher* source) OVERRIDE;
virtual void RunCallbackOnPrematureFailure(GDataErrorCode code) OVERRIDE;
const GURL& document_url() const { return document_url_; }
@@ -189,24 +186,15 @@
virtual ~GetDataOperation();
// Parse GData JSON response.
- virtual void ParseResponse(GDataErrorCode fetch_error_code,
- const std::string& data);
+ virtual base::Value* ParseResponse(const std::string& data);
protected:
// Overridden from UrlFetchOperationBase.
- virtual void ProcessURLFetchResults(const net::URLFetcher* source) OVERRIDE;
- virtual void RunCallbackOnPrematureFailure(
- GDataErrorCode fetch_error_code) OVERRIDE;
- void RunCallback(GDataErrorCode fetch_error_code,
- scoped_ptr<base::Value> value);
+ virtual bool ProcessURLFetchResults(const net::URLFetcher* source) OVERRIDE;
+ virtual void RunCallbackOnPrematureFailure(GDataErrorCode code) OVERRIDE;
private:
- // Called when ParseJsonOnBlockingPool() is completed.
- void OnDataParsed(gdata::GDataErrorCode fetch_error_code,
- scoped_ptr<base::Value>* value);
-
GetDataCallback callback_;
- base::WeakPtrFactory<GetDataOperation> weak_ptr_factory_;
DISALLOW_COPY_AND_ASSIGN(GetDataOperation);
};
« no previous file with comments | « chrome/browser/chromeos/gdata/gdata_operations_unittest.cc ('k') | chrome/browser/chromeos/gdata/operations_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698