Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5930)

Unified Diff: chrome_frame/urlmon_url_request_private.h

Issue 6056007: net: Add namespace net to the remaining files under url_request directory. (Closed)
Patch Set: chromeos fixes Created 9 years, 11 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
« no previous file with comments | « chrome_frame/urlmon_url_request.h ('k') | net/ocsp/nss_ocsp.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_frame/urlmon_url_request_private.h
diff --git a/chrome_frame/urlmon_url_request_private.h b/chrome_frame/urlmon_url_request_private.h
index ebe027c336a8e9d56e3b5a5af4aef9bf76a4ec0d..90068bda3e281e62d8f670d72187a69367d468cb 100644
--- a/chrome_frame/urlmon_url_request_private.h
+++ b/chrome_frame/urlmon_url_request_private.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.
@@ -164,7 +164,7 @@ class UrlmonUrlRequest
// Assumes binding_->Abort() will be called!
void SetRedirected(int http_code, const std::string& utf8_url) {
DCHECK_EQ(state_, WORKING);
- DCHECK_EQ(result_.status(), URLRequestStatus::SUCCESS);
+ DCHECK_EQ(result_.status(), net::URLRequestStatus::SUCCESS);
redirect_.utf8_url = utf8_url;
// At times we receive invalid redirect codes like 0, 200, etc. We
@@ -176,7 +176,7 @@ class UrlmonUrlRequest
state_ = ABORTING;
}
- // Set the result as URLRequestStatus::CANCELED.
+ // Set the result as net::URLRequestStatus::CANCELED.
// Switch to [ABORTING] state (if not already in that state).
void Cancel() {
if (state_ == DONE)
@@ -190,7 +190,7 @@ class UrlmonUrlRequest
redirect_.utf8_url.clear();
}
- set_result(URLRequestStatus::CANCELED, 0);
+ set_result(net::URLRequestStatus::CANCELED, 0);
}
void Done() {
@@ -205,25 +205,25 @@ class UrlmonUrlRequest
return redirect_;
}
- const URLRequestStatus& get_result() const {
+ const net::URLRequestStatus& get_result() const {
return result_;
}
- void set_result(URLRequestStatus::Status status, int os_error) {
+ void set_result(net::URLRequestStatus::Status status, int os_error) {
result_.set_status(status);
result_.set_os_error(os_error);
}
void set_result(HRESULT hr) {
- result_.set_status(FAILED(hr)? URLRequestStatus::FAILED:
- URLRequestStatus::SUCCESS);
+ result_.set_status(FAILED(hr)? net::URLRequestStatus::FAILED:
+ net::URLRequestStatus::SUCCESS);
result_.set_os_error(HresultToNetError(hr));
}
private:
Redirection redirect_;
State state_;
- URLRequestStatus result_;
+ net::URLRequestStatus result_;
};
Status status_;
« no previous file with comments | « chrome_frame/urlmon_url_request.h ('k') | net/ocsp/nss_ocsp.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698