diff options
Diffstat (limited to 'chrome/service')
4 files changed, 23 insertions, 16 deletions
diff --git a/chrome/service/cloud_print/cloud_print_url_fetcher.h b/chrome/service/cloud_print/cloud_print_url_fetcher.h index 5fc4fb1..850265e 100644 --- a/chrome/service/cloud_print/cloud_print_url_fetcher.h +++ b/chrome/service/cloud_print/cloud_print_url_fetcher.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -13,7 +13,10 @@ class DictionaryValue; class GURL; + +namespace net { class URLRequestStatus; +} // namespace net // A wrapper around URLFetcher for CloudPrint. URLFetcher applies retry logic // only on HTTP response codes >= 500. In the cloud print case, we want to @@ -36,12 +39,13 @@ class CloudPrintURLFetcher // error checking is done before this method is called. If the delegate // returns CONTINUE_PROCESSING, we will then check for network // errors. Most implementations will not override this. - virtual ResponseAction HandleRawResponse(const URLFetcher* source, - const GURL& url, - const URLRequestStatus& status, - int response_code, - const ResponseCookies& cookies, - const std::string& data) { + virtual ResponseAction HandleRawResponse( + const URLFetcher* source, + const GURL& url, + const net::URLRequestStatus& status, + int response_code, + const ResponseCookies& cookies, + const std::string& data) { return CONTINUE_PROCESSING; } // This will be invoked only if HandleRawResponse returns @@ -87,7 +91,7 @@ class CloudPrintURLFetcher // URLFetcher::Delegate implementation. virtual void OnURLFetchComplete(const URLFetcher* source, const GURL& url, - const URLRequestStatus& status, + const net::URLRequestStatus& status, int response_code, const ResponseCookies& cookies, const std::string& data); diff --git a/chrome/service/gaia/service_gaia_authenticator.cc b/chrome/service/gaia/service_gaia_authenticator.cc index d6a1948..1f57626 100644 --- a/chrome/service/gaia/service_gaia_authenticator.cc +++ b/chrome/service/gaia/service_gaia_authenticator.cc @@ -72,9 +72,12 @@ void ServiceGaiaAuthenticator::DoPost(const GURL& post_url, // URLFetcher::Delegate implementation void ServiceGaiaAuthenticator::OnURLFetchComplete( - const URLFetcher *source, const GURL &url, const URLRequestStatus &status, - int response_code, const ResponseCookies &cookies, - const std::string &data) { + const URLFetcher* source, + const GURL& url, + const net::URLRequestStatus& status, + int response_code, + const ResponseCookies& cookies, + const std::string& data) { DCHECK(io_message_loop_proxy_->BelongsToCurrentThread()); http_response_code_ = response_code; response_data_ = data; diff --git a/chrome/service/gaia/service_gaia_authenticator.h b/chrome/service/gaia/service_gaia_authenticator.h index 5d2813a..14adcff 100644 --- a/chrome/service/gaia/service_gaia_authenticator.h +++ b/chrome/service/gaia/service_gaia_authenticator.h @@ -33,7 +33,7 @@ class ServiceGaiaAuthenticator // URLFetcher::Delegate implementation. virtual void OnURLFetchComplete(const URLFetcher *source, const GURL &url, - const URLRequestStatus &status, + const net::URLRequestStatus &status, int response_code, const ResponseCookies &cookies, const std::string &data); diff --git a/chrome/service/net/service_url_request_context.h b/chrome/service/net/service_url_request_context.h index d1bb2bf..4e6e296 100644 --- a/chrome/service/net/service_url_request_context.h +++ b/chrome/service/net/service_url_request_context.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -29,7 +29,7 @@ class MessageLoopProxy; // for requests. This subclass is meant to be used in the service process where // the profile is not available. // -class ServiceURLRequestContext : public URLRequestContext { +class ServiceURLRequestContext : public net::URLRequestContext { public: explicit ServiceURLRequestContext(const std::string& user_agent); void set_cookie_policy(net::CookiePolicy* policy) { @@ -50,7 +50,7 @@ class ServiceURLRequestContextGetter : public URLRequestContextGetter { public: ServiceURLRequestContextGetter(); - virtual URLRequestContext* GetURLRequestContext(); + virtual net::URLRequestContext* GetURLRequestContext(); virtual scoped_refptr<base::MessageLoopProxy> GetIOMessageLoopProxy() const; void set_user_agent(const std::string& ua) { @@ -63,7 +63,7 @@ class ServiceURLRequestContextGetter : public URLRequestContextGetter { virtual ~ServiceURLRequestContextGetter(); std::string user_agent_; - scoped_refptr<URLRequestContext> url_request_context_; + scoped_refptr<net::URLRequestContext> url_request_context_; scoped_refptr<base::MessageLoopProxy> io_message_loop_proxy_; }; |