| Index: chrome/browser/net/gaia/gaia_oauth_fetcher.h
|
| ===================================================================
|
| --- chrome/browser/net/gaia/gaia_oauth_fetcher.h (revision 106929)
|
| +++ chrome/browser/net/gaia/gaia_oauth_fetcher.h (working copy)
|
| @@ -7,11 +7,12 @@
|
| #pragma once
|
|
|
| #include <string>
|
| +#include <vector>
|
|
|
| #include "base/memory/scoped_ptr.h"
|
| #include "chrome/browser/net/chrome_cookie_notification_details.h"
|
| #include "chrome/browser/net/gaia/gaia_oauth_consumer.h"
|
| -#include "content/common/net/url_fetcher.h"
|
| +#include "content/public/common/url_fetcher_delegate.h"
|
| #include "content/public/browser/notification_observer.h"
|
| #include "content/public/browser/notification_registrar.h"
|
| #include "googleurl/src/gurl.h"
|
| @@ -21,6 +22,12 @@
|
| class Browser;
|
| class Profile;
|
|
|
| +namespace net {
|
| +class URLRequestContextGetter;
|
| +class URLRequestStatus;
|
| +typedef std::vector<std::string> ResponseCookies;
|
| +}
|
| +
|
| // Authenticate a user using Gaia's OAuth1 and OAuth2 support.
|
| //
|
| // Users of this class typically desire an OAuth2 Access token scoped for a
|
| @@ -38,7 +45,7 @@
|
| //
|
| // This class can handle one request at a time, and all calls through an
|
| // instance should be serialized.
|
| -class GaiaOAuthFetcher : public URLFetcher::Delegate,
|
| +class GaiaOAuthFetcher : public content::URLFetcherDelegate,
|
| public content::NotificationObserver {
|
| public:
|
| // Defines steps of OAuth process performed by this class.
|
| @@ -128,13 +135,8 @@
|
| virtual void OnBrowserClosing(Browser* profile,
|
| bool detail);
|
|
|
| - // Implementation of URLFetcher::Delegate
|
| - virtual void OnURLFetchComplete(const URLFetcher* source,
|
| - const GURL& url,
|
| - const net::URLRequestStatus& status,
|
| - int response_code,
|
| - const net::ResponseCookies& cookies,
|
| - const std::string& data) OVERRIDE;
|
| + // Implementation of content::URLFetcherDelegate
|
| + virtual void OnURLFetchComplete(const URLFetcher* source) OVERRIDE;
|
|
|
| // StartGetOAuthToken (or other Start* routine) been called, but results
|
| // are not back yet.
|
| @@ -234,7 +236,7 @@
|
| const std::string& body,
|
| const std::string& headers,
|
| bool send_cookies,
|
| - URLFetcher::Delegate* delegate);
|
| + content::URLFetcherDelegate* delegate);
|
|
|
| bool ShouldAutoFetch(AutoFetchLimit fetch_step);
|
|
|
|
|