diff options
author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-06 04:19:30 +0000 |
---|---|---|
committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-06 04:19:30 +0000 |
commit | 27a112c2e8c464ddd4aed5e1f425204bb3f96d54 (patch) | |
tree | a02d4a66a90a040a04aa64cb94948c8e7df59658 /chrome/browser/sync | |
parent | e79cf09fd1bd403396a65a3c02642b075ec3d1d9 (diff) | |
download | chromium_src-27a112c2e8c464ddd4aed5e1f425204bb3f96d54.zip chromium_src-27a112c2e8c464ddd4aed5e1f425204bb3f96d54.tar.gz chromium_src-27a112c2e8c464ddd4aed5e1f425204bb3f96d54.tar.bz2 |
net: Add namespace net to the remaining files under url_request directory.
It just adds the 'namespace net' to these files and a typedef for them, because there are many
entries to fix in one pass. They will be fixed later.
BUG=64263
TEST=trybots
Review URL: http://codereview.chromium.org/6056007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70592 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync')
-rw-r--r-- | chrome/browser/sync/glue/http_bridge.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/chrome/browser/sync/glue/http_bridge.h b/chrome/browser/sync/glue/http_bridge.h index 30a4e22..5fb2419 100644 --- a/chrome/browser/sync/glue/http_bridge.h +++ b/chrome/browser/sync/glue/http_bridge.h @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 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. @@ -41,13 +41,13 @@ class HttpBridge : public base::RefCountedThreadSafe<HttpBridge>, // 2) avoids ifdefs for now // 3) not sure we want to strictly follow settings for cookie policy, // accept lang/charset, since changing these could break syncing. - class RequestContext : public URLRequestContext { + class RequestContext : public net::URLRequestContext { public: // |baseline_context| is used to obtain the accept-language, // accept-charsets, and proxy service information for bridged requests. // Typically |baseline_context| should be the URLRequestContext of the // currently active profile. - explicit RequestContext(URLRequestContext* baseline_context); + explicit RequestContext(net::URLRequestContext* baseline_context); // Set the user agent for requests using this context. The default is // the browser's UA string. @@ -57,7 +57,7 @@ class HttpBridge : public base::RefCountedThreadSafe<HttpBridge>, // If the user agent is set explicitly return that, otherwise call the // base class method to return default value. return user_agent_.empty() ? - URLRequestContext::GetUserAgent(url) : user_agent_; + net::URLRequestContext::GetUserAgent(url) : user_agent_; } private: @@ -65,7 +65,7 @@ class HttpBridge : public base::RefCountedThreadSafe<HttpBridge>, ~RequestContext(); std::string user_agent_; - URLRequestContext* baseline_context_; + net::URLRequestContext* baseline_context_; DISALLOW_COPY_AND_ASSIGN(RequestContext); }; @@ -80,7 +80,7 @@ class HttpBridge : public base::RefCountedThreadSafe<HttpBridge>, bool is_user_agent_set() const { return !user_agent_.empty(); } // URLRequestContextGetter implementation. - virtual URLRequestContext* GetURLRequestContext(); + virtual net::URLRequestContext* GetURLRequestContext(); virtual scoped_refptr<base::MessageLoopProxy> GetIOMessageLoopProxy() const; private: @@ -117,8 +117,9 @@ class HttpBridge : public base::RefCountedThreadSafe<HttpBridge>, const std::string& name) const; // URLFetcher::Delegate implementation. - virtual void OnURLFetchComplete(const URLFetcher* source, const GURL& url, - const URLRequestStatus& status, + virtual void OnURLFetchComplete(const URLFetcher* source, + const GURL& url, + const net::URLRequestStatus& status, int response_code, const ResponseCookies& cookies, const std::string& data); |