chrome/browser/net/gaia/gaia_oauth_fetcher.cc - Issue 8373021: Convert URLFetcher::Delegates to use an interface in content/public/common. Also remove the old U...

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/net/gaia/gaia_oauth_fetcher.cc

Issue 8373021: Convert URLFetcher::Delegates to use an interface in content/public/common. Also remove the old U... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: sync and remove unncessary forward declares Created 9 years, 2 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/metrics/metrics_service.cc ('K') | « chrome/browser/net/gaia/gaia_oauth_fetcher.h ('k') | chrome/browser/net/gaia/gaia_oauth_fetcher_unittest.cc » ('j') | content/common/net/url_fetcher.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/net/gaia/gaia_oauth_fetcher.cc

===================================================================

--- chrome/browser/net/gaia/gaia_oauth_fetcher.cc (revision 106929)

+++ chrome/browser/net/gaia/gaia_oauth_fetcher.cc (working copy)

@@ -24,6 +24,7 @@

#include "chrome/common/net/http_return.h"

#include "content/public/browser/notification_details.h"

#include "content/public/browser/notification_source.h"

+#include "content/common/net/url_fetcher.h"

#include "grit/chromium_strings.h"

#include "net/base/load_flags.h"

#include "net/url_request/url_request_context_getter.h"

@@ -62,7 +63,7 @@

const std::string& body,

const std::string& headers,

bool send_cookies,

- URLFetcher::Delegate* delegate) {

+ content::URLFetcherDelegate* delegate) {

bool empty_body = body.empty();

URLFetcher* result =

URLFetcher::Create(0,

@@ -654,18 +655,18 @@

}

-void GaiaOAuthFetcher::OnURLFetchComplete(const URLFetcher* source,

- const GURL& url,

- const net::URLRequestStatus& status,

- int response_code,

- const net::ResponseCookies& cookies,

- const std::string& data) {

+void GaiaOAuthFetcher::OnURLFetchComplete(const URLFetcher* source) {

// Keep |fetcher_| around to avoid invalidating its |status| (accessed below).

scoped_ptr<URLFetcher> current_fetcher(fetcher_.release());

fetch_pending_ = false;

GaiaUrls* gaia_urls = GaiaUrls::GetInstance();

+ GURL url = source->url();

+ std::string data;

+ source->GetResponseAsString(&data);

+ net::URLRequestStatus status = source->status();

+ int response_code = source->response_code();

if (StartsWithASCII(url.spec(), gaia_urls->get_oauth_token_url(), true)) {

- OnGetOAuthTokenUrlFetched(cookies, status, response_code);

+ OnGetOAuthTokenUrlFetched(source->cookies(), status, response_code);

} else if (url.spec() == gaia_urls->oauth1_login_url()) {

OnOAuthLoginFetched(data, status, response_code);

} else if (url.spec() == gaia_urls->oauth_get_access_token_url()) {