summaryrefslogtreecommitdiffstats
path: root/android
diff options
context:
space:
mode:
authorKristian Monsen <kristianm@google.com>2011-06-02 15:12:13 +0100
committerKristian Monsen <kristianm@google.com>2011-06-14 20:31:44 -0700
commit532b5811cf4c192c4333b19108d6a303edb23691 (patch)
tree52328b7c38ab3f4cc1022c5da5007be102119faa /android
parentee7d9dfef7bc481d20ed0fe1e6f382495b25e2a7 (diff)
downloadexternal_chromium-532b5811cf4c192c4333b19108d6a303edb23691.zip
external_chromium-532b5811cf4c192c4333b19108d6a303edb23691.tar.gz
external_chromium-532b5811cf4c192c4333b19108d6a303edb23691.tar.bz2
Merge Chromium at r11.0.672.0: Compile fix in url_fetcher_proxy.h
Typedef removed in: http://src.chromium.org/viewvc/chrome/trunk/src/net/url_request/url_request_status.h?r1=70592&r2=71285&pathrev=74924 Change-Id: I2819b8a476bec59dc8c99d75efa81eb4351bf9b2
Diffstat (limited to 'android')
-rw-r--r--android/autofill/url_fetcher_proxy.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/android/autofill/url_fetcher_proxy.h b/android/autofill/url_fetcher_proxy.h
index 201a269..9ea2951 100644
--- a/android/autofill/url_fetcher_proxy.h
+++ b/android/autofill/url_fetcher_proxy.h
@@ -108,7 +108,7 @@ public:
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)
@@ -160,7 +160,7 @@ private:
std::string upload_content_;
GURL url_;
- URLRequestStatus status_;
+ net::URLRequestStatus status_;
int response_code_;
ResponseCookies cookies_;
std::string data_;