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

Side by Side Diff: android_webview/native/aw_web_resource_response_impl.cc

Issue 1852513003: Convert //android_webview to use std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: git is hard Created 4 years, 8 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/native/aw_web_resource_response_impl.h" 5 #include "android_webview/native/aw_web_resource_response_impl.h"
6 6
7 #include "android_webview/native/input_stream_impl.h" 7 #include "android_webview/native/input_stream_impl.h"
8 #include "base/android/jni_android.h" 8 #include "base/android/jni_android.h"
9 #include "base/android/jni_array.h" 9 #include "base/android/jni_array.h"
10 #include "base/android/jni_string.h" 10 #include "base/android/jni_string.h"
11 #include "base/memory/ptr_util.h"
11 #include "jni/AwWebResourceResponse_jni.h" 12 #include "jni/AwWebResourceResponse_jni.h"
12 #include "net/http/http_response_headers.h" 13 #include "net/http/http_response_headers.h"
13 #include "net/url_request/url_request.h" 14 #include "net/url_request/url_request.h"
14 #include "net/url_request/url_request_job.h" 15 #include "net/url_request/url_request_job.h"
15 16
16 using base::android::ScopedJavaLocalRef; 17 using base::android::ScopedJavaLocalRef;
17 using base::android::AppendJavaStringArrayToStringVector; 18 using base::android::AppendJavaStringArrayToStringVector;
18 19
19 namespace android_webview { 20 namespace android_webview {
20 21
21 AwWebResourceResponseImpl::AwWebResourceResponseImpl( 22 AwWebResourceResponseImpl::AwWebResourceResponseImpl(
22 const base::android::JavaRef<jobject>& obj) 23 const base::android::JavaRef<jobject>& obj)
23 : java_object_(obj) { 24 : java_object_(obj) {
24 } 25 }
25 26
26 AwWebResourceResponseImpl::~AwWebResourceResponseImpl() { 27 AwWebResourceResponseImpl::~AwWebResourceResponseImpl() {
27 } 28 }
28 29
29 scoped_ptr<InputStream> 30 std::unique_ptr<InputStream> AwWebResourceResponseImpl::GetInputStream(
30 AwWebResourceResponseImpl::GetInputStream(JNIEnv* env) const { 31 JNIEnv* env) const {
31 ScopedJavaLocalRef<jobject> jstream = 32 ScopedJavaLocalRef<jobject> jstream =
32 Java_AwWebResourceResponse_getData(env, java_object_.obj()); 33 Java_AwWebResourceResponse_getData(env, java_object_.obj());
33 if (jstream.is_null()) 34 if (jstream.is_null())
34 return scoped_ptr<InputStream>(); 35 return std::unique_ptr<InputStream>();
35 return make_scoped_ptr<InputStream>(new InputStreamImpl(jstream)); 36 return base::WrapUnique(new InputStreamImpl(jstream));
36 } 37 }
37 38
38 bool AwWebResourceResponseImpl::GetMimeType(JNIEnv* env, 39 bool AwWebResourceResponseImpl::GetMimeType(JNIEnv* env,
39 std::string* mime_type) const { 40 std::string* mime_type) const {
40 ScopedJavaLocalRef<jstring> jstring_mime_type = 41 ScopedJavaLocalRef<jstring> jstring_mime_type =
41 Java_AwWebResourceResponse_getMimeType(env, java_object_.obj()); 42 Java_AwWebResourceResponse_getMimeType(env, java_object_.obj());
42 if (jstring_mime_type.is_null()) 43 if (jstring_mime_type.is_null())
43 return false; 44 return false;
44 *mime_type = ConvertJavaStringToUTF8(jstring_mime_type); 45 *mime_type = ConvertJavaStringToUTF8(jstring_mime_type);
45 return true; 46 return true;
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 headers->AddHeader(header_line); 96 headers->AddHeader(header_line);
96 } 97 }
97 return true; 98 return true;
98 } 99 }
99 100
100 bool RegisterAwWebResourceResponse(JNIEnv* env) { 101 bool RegisterAwWebResourceResponse(JNIEnv* env) {
101 return RegisterNativesImpl(env); 102 return RegisterNativesImpl(env);
102 } 103 }
103 104
104 } // namespace android_webview 105 } // namespace android_webview
OLDNEW
« no previous file with comments | « android_webview/native/aw_web_resource_response_impl.h ('k') | android_webview/native/cookie_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698