diff options
Diffstat (limited to 'chrome/browser/chromeos')
10 files changed, 16 insertions, 15 deletions
diff --git a/chrome/browser/chromeos/customization_document.cc b/chrome/browser/chromeos/customization_document.cc index 33e40d2..37323cf 100644 --- a/chrome/browser/chromeos/customization_document.cc +++ b/chrome/browser/chromeos/customization_document.cc @@ -319,7 +319,7 @@ void ServicesCustomizationDocument::OnURLFetchComplete( const GURL& url, const net::URLRequestStatus& status, int response_code, - const ResponseCookies& cookies, + const net::ResponseCookies& cookies, const std::string& data) { if (response_code == 200) { LoadManifestFromString(data); diff --git a/chrome/browser/chromeos/customization_document.h b/chrome/browser/chromeos/customization_document.h index f673266..f194554 100644 --- a/chrome/browser/chromeos/customization_document.h +++ b/chrome/browser/chromeos/customization_document.h @@ -175,7 +175,7 @@ class ServicesCustomizationDocument : public CustomizationDocument, const GURL& url, const net::URLRequestStatus& status, int response_code, - const ResponseCookies& cookies, + const net::ResponseCookies& cookies, const std::string& data); // Initiate file fetching. diff --git a/chrome/browser/chromeos/login/cookie_fetcher.cc b/chrome/browser/chromeos/login/cookie_fetcher.cc index 22fb2da..25e5e79 100644 --- a/chrome/browser/chromeos/login/cookie_fetcher.cc +++ b/chrome/browser/chromeos/login/cookie_fetcher.cc @@ -36,7 +36,7 @@ void CookieFetcher::OnURLFetchComplete(const URLFetcher* source, const GURL& url, const net::URLRequestStatus& status, int response_code, - const ResponseCookies& cookies, + const net::ResponseCookies& cookies, const std::string& data) { if (status.is_success() && response_code == kHttpSuccess) { if (issue_handler_->CanHandle(url)) { diff --git a/chrome/browser/chromeos/login/cookie_fetcher.h b/chrome/browser/chromeos/login/cookie_fetcher.h index 0cae04d..2540479 100644 --- a/chrome/browser/chromeos/login/cookie_fetcher.h +++ b/chrome/browser/chromeos/login/cookie_fetcher.h @@ -7,6 +7,7 @@ #pragma once #include <string> + #include "base/memory/scoped_ptr.h" #include "chrome/browser/chromeos/login/auth_response_handler.h" #include "chrome/browser/chromeos/login/client_login_response_handler.h" @@ -49,7 +50,7 @@ class CookieFetcher : public URLFetcher::Delegate { const GURL& url, const net::URLRequestStatus& status, int response_code, - const ResponseCookies& cookies, + const net::ResponseCookies& cookies, const std::string& data); private: diff --git a/chrome/browser/chromeos/login/image_downloader.cc b/chrome/browser/chromeos/login/image_downloader.cc index b36a44e..73f88ad 100644 --- a/chrome/browser/chromeos/login/image_downloader.cc +++ b/chrome/browser/chromeos/login/image_downloader.cc @@ -10,9 +10,9 @@ #include "base/message_loop.h" #include "base/string_util.h" #include "base/stringprintf.h" -#include "content/browser/browser_thread.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/common/net/url_fetcher.h" +#include "content/browser/browser_thread.h" namespace chromeos { @@ -42,7 +42,7 @@ void ImageDownloader::OnURLFetchComplete(const URLFetcher* source, const GURL& url, const net::URLRequestStatus& status, int response_code, - const ResponseCookies& cookies, + const net::ResponseCookies& cookies, const std::string& data) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); if (response_code != 200) { diff --git a/chrome/browser/chromeos/login/image_downloader.h b/chrome/browser/chromeos/login/image_downloader.h index c18170c..a3683be 100644 --- a/chrome/browser/chromeos/login/image_downloader.h +++ b/chrome/browser/chromeos/login/image_downloader.h @@ -33,7 +33,7 @@ class ImageDownloader : public URLFetcher::Delegate { const GURL& url, const net::URLRequestStatus& status, int response_code, - const ResponseCookies& cookies, + const net::ResponseCookies& cookies, const std::string& data); ImageDecoder::Delegate* delegate_; diff --git a/chrome/browser/chromeos/login/mock_auth_response_handler.cc b/chrome/browser/chromeos/login/mock_auth_response_handler.cc index be82e83..419b107 100644 --- a/chrome/browser/chromeos/login/mock_auth_response_handler.cc +++ b/chrome/browser/chromeos/login/mock_auth_response_handler.cc @@ -42,7 +42,7 @@ void MockAuthResponseHandler::CompleteFetch(URLFetcher::Delegate* delegate, remote, status, http_response_code, - ResponseCookies(), + net::ResponseCookies(), data); } diff --git a/chrome/browser/chromeos/login/mock_url_fetchers.cc b/chrome/browser/chromeos/login/mock_url_fetchers.cc index de666e9..2a855c2 100644 --- a/chrome/browser/chromeos/login/mock_url_fetchers.cc +++ b/chrome/browser/chromeos/login/mock_url_fetchers.cc @@ -62,7 +62,7 @@ void GotCanceledFetcher::Start() { url_, status, RC_FORBIDDEN, - ResponseCookies(), + net::ResponseCookies(), std::string()); } @@ -83,7 +83,7 @@ void SuccessFetcher::Start() { url_, success, RC_REQUEST_OK, - ResponseCookies(), + net::ResponseCookies(), std::string()); } @@ -104,7 +104,7 @@ void FailFetcher::Start() { url_, failed, RC_REQUEST_OK, - ResponseCookies(), + net::ResponseCookies(), std::string()); } @@ -158,7 +158,7 @@ void CaptchaFetcher::Start() { url_, success, RC_FORBIDDEN, - ResponseCookies(), + net::ResponseCookies(), body); } @@ -187,7 +187,7 @@ void HostedFetcher::Start() { url_, success, response_code, - ResponseCookies(), + net::ResponseCookies(), data); } diff --git a/chrome/browser/chromeos/login/user_image_downloader.cc b/chrome/browser/chromeos/login/user_image_downloader.cc index 2da9305..c6d9c29 100644 --- a/chrome/browser/chromeos/login/user_image_downloader.cc +++ b/chrome/browser/chromeos/login/user_image_downloader.cc @@ -62,7 +62,7 @@ void UserImageDownloader::OnURLFetchComplete( const GURL& url, const net::URLRequestStatus& status, int response_code, - const ResponseCookies& cookies, + const net::ResponseCookies& cookies, const std::string& data) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); if (response_code != 200) { diff --git a/chrome/browser/chromeos/login/user_image_downloader.h b/chrome/browser/chromeos/login/user_image_downloader.h index c6c776bf..655f8e6 100644 --- a/chrome/browser/chromeos/login/user_image_downloader.h +++ b/chrome/browser/chromeos/login/user_image_downloader.h @@ -39,7 +39,7 @@ class UserImageDownloader : public URLFetcher::Delegate, const GURL& url, const net::URLRequestStatus& status, int response_code, - const ResponseCookies& cookies, + const net::ResponseCookies& cookies, const std::string& data); // Overriden from ImageDecoder::Delegate: |