diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-07-05 23:02:58 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-07-08 17:55:06 +0100 |
| commit | 8474bd350e233cca45dcbfe5f8e4f542675c4c66 (patch) | |
| tree | 22bda6115bff31e1c867f970993988f2d54b6bc9 /chrome | |
| parent | a628b56b8b7c7f9a8730b0e43c6e04fcf3619b7e (diff) | |
| download | external_chromium-8474bd350e233cca45dcbfe5f8e4f542675c4c66.zip external_chromium-8474bd350e233cca45dcbfe5f8e4f542675c4c66.tar.gz external_chromium-8474bd350e233cca45dcbfe5f8e4f542675c4c66.tar.bz2 | |
Merge Chromium at r12.0.742.93: Compile fixes from moving url_request_context_getter
Change-Id: I9daca7590633f466d3066e359a3bb8c6d29d6d19
http://codereview.chromium.org/6778025
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/common/net/url_fetcher.cc | 2 | ||||
| -rw-r--r-- | chrome/common/net/url_fetcher.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome/common/net/url_fetcher.cc b/chrome/common/net/url_fetcher.cc index 18878d2..995fbe1 100644 --- a/chrome/common/net/url_fetcher.cc +++ b/chrome/common/net/url_fetcher.cc @@ -565,7 +565,7 @@ void URLFetcher::set_request_context( } #ifdef ANDROID -URLRequestContextGetter* URLFetcher::request_context() { +net::URLRequestContextGetter* URLFetcher::request_context() { return core_->request_context_getter_; } #endif diff --git a/chrome/common/net/url_fetcher.h b/chrome/common/net/url_fetcher.h index 3b9d93b..73f4a2c 100644 --- a/chrome/common/net/url_fetcher.h +++ b/chrome/common/net/url_fetcher.h @@ -171,7 +171,7 @@ class URLFetcher { net::URLRequestContextGetter* request_context_getter); #ifdef ANDROID - URLRequestContextGetter* request_context(); + net::URLRequestContextGetter* request_context(); #endif // If |retry| is false, 5xx responses will be propagated to the observer, |