| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "android_webview/browser/aw_request_interceptor.h" | 5 #include "android_webview/browser/aw_request_interceptor.h" |
| 6 | 6 |
| 7 #include "android_webview/browser/aw_contents_io_thread_client.h" | 7 #include "android_webview/browser/aw_contents_io_thread_client.h" |
| 8 #include "android_webview/browser/aw_web_resource_response.h" | 8 #include "android_webview/browser/aw_web_resource_response.h" |
| 9 #include "base/android/jni_string.h" | 9 #include "base/android/jni_string.h" |
| 10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| 11 #include "content/public/browser/browser_thread.h" | 11 #include "content/public/browser/browser_thread.h" |
| 12 #include "content/public/browser/render_view_host.h" | 12 #include "content/public/browser/render_view_host.h" |
| 13 #include "content/public/browser/resource_request_info.h" | 13 #include "content/public/browser/resource_request_info.h" |
| 14 #include "net/url_request/url_request.h" | 14 #include "net/url_request/url_request.h" |
| 15 #include "net/url_request/url_request_context.h" | 15 #include "net/url_request/url_request_context.h" |
| 16 #include "net/url_request/url_request_context_getter.h" | 16 #include "net/url_request/url_request_context_getter.h" |
| 17 #include "net/url_request/url_request_job.h" | 17 #include "net/url_request/url_request_job.h" |
| 18 | 18 |
| 19 using content::BrowserThread; | 19 using content::BrowserThread; |
| 20 using content::RenderViewHost; | 20 using content::RenderViewHost; |
| 21 using content::ResourceRequestInfo; | 21 using content::ResourceRequestInfo; |
| 22 | 22 |
| 23 namespace android_webview { | 23 namespace android_webview { |
| 24 | 24 |
| 25 namespace { | 25 namespace { |
| 26 | 26 |
| 27 const void* kRequestAlreadyQueriedDataKey = &kRequestAlreadyQueriedDataKey; | 27 const void* const kRequestAlreadyQueriedDataKey = |
| 28 &kRequestAlreadyQueriedDataKey; |
| 28 | 29 |
| 29 } // namespace | 30 } // namespace |
| 30 | 31 |
| 31 AwRequestInterceptor::AwRequestInterceptor() { | 32 AwRequestInterceptor::AwRequestInterceptor() { |
| 32 } | 33 } |
| 33 | 34 |
| 34 AwRequestInterceptor::~AwRequestInterceptor() { | 35 AwRequestInterceptor::~AwRequestInterceptor() { |
| 35 } | 36 } |
| 36 | 37 |
| 37 scoped_ptr<AwWebResourceResponse> | 38 scoped_ptr<AwWebResourceResponse> |
| 38 AwRequestInterceptor::QueryForAwWebResourceResponse( | 39 AwRequestInterceptor::QueryForAwWebResourceResponse( |
| 39 net::URLRequest* request) const { | 40 net::URLRequest* request) const { |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 79 QueryForAwWebResourceResponse(request); | 80 QueryForAwWebResourceResponse(request); |
| 80 | 81 |
| 81 if (!aw_web_resource_response) | 82 if (!aw_web_resource_response) |
| 82 return NULL; | 83 return NULL; |
| 83 | 84 |
| 84 // The newly created job will own the AwWebResourceResponse. | 85 // The newly created job will own the AwWebResourceResponse. |
| 85 return AwWebResourceResponse::CreateJobFor( | 86 return AwWebResourceResponse::CreateJobFor( |
| 86 aw_web_resource_response.Pass(), request, network_delegate); | 87 aw_web_resource_response.Pass(), request, network_delegate); |
| 87 } | 88 } |
| 88 | 89 |
| 89 } // namespace android_webview | 90 } // namespace android_webview |
| OLD | NEW |