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

Side by Side Diff: content/browser/android/download_controller_android_impl.cc

Issue 1552733002: Convert Pass()→std::move() in //content (Android edition) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 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 unified diff | Download patch
OLDNEW
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 "content/browser/android/download_controller_android_impl.h" 5 #include "content/browser/android/download_controller_android_impl.h"
6 6
7 #include <utility>
8
7 #include "base/android/context_utils.h" 9 #include "base/android/context_utils.h"
8 #include "base/android/jni_android.h" 10 #include "base/android/jni_android.h"
9 #include "base/android/jni_string.h" 11 #include "base/android/jni_string.h"
10 #include "base/bind.h" 12 #include "base/bind.h"
11 #include "base/lazy_instance.h" 13 #include "base/lazy_instance.h"
12 #include "base/logging.h" 14 #include "base/logging.h"
13 #include "base/memory/scoped_ptr.h" 15 #include "base/memory/scoped_ptr.h"
14 #include "base/synchronization/lock.h" 16 #include "base/synchronization/lock.h"
15 #include "base/time/time.h" 17 #include "base/time/time.h"
16 #include "content/browser/android/content_view_core_impl.h" 18 #include "content/browser/android/content_view_core_impl.h"
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 dl_params->set_referrer(referrer); 87 dl_params->set_referrer(referrer);
86 if (is_link) 88 if (is_link)
87 dl_params->set_referrer_encoding(params.frame_charset); 89 dl_params->set_referrer_encoding(params.frame_charset);
88 net::HttpRequestHeaders headers; 90 net::HttpRequestHeaders headers;
89 headers.AddHeadersFromString(extra_headers); 91 headers.AddHeadersFromString(extra_headers);
90 for (net::HttpRequestHeaders::Iterator it(headers); it.GetNext();) 92 for (net::HttpRequestHeaders::Iterator it(headers); it.GetNext();)
91 dl_params->add_request_header(it.name(), it.value()); 93 dl_params->add_request_header(it.name(), it.value());
92 if (!is_link && extra_headers.empty()) 94 if (!is_link && extra_headers.empty())
93 dl_params->set_prefer_cache(true); 95 dl_params->set_prefer_cache(true);
94 dl_params->set_prompt(false); 96 dl_params->set_prompt(false);
95 dlm->DownloadUrl(dl_params.Pass()); 97 dlm->DownloadUrl(std::move(dl_params));
96 } 98 }
97 99
98 } // namespace 100 } // namespace
99 101
100 namespace content { 102 namespace content {
101 103
102 // JNI methods 104 // JNI methods
103 static void Init(JNIEnv* env, const JavaParamRef<jobject>& obj) { 105 static void Init(JNIEnv* env, const JavaParamRef<jobject>& obj) {
104 DownloadControllerAndroidImpl::GetInstance()->Init(env, obj); 106 DownloadControllerAndroidImpl::GetInstance()->Init(env, obj);
105 } 107 }
(...skipping 459 matching lines...) Expand 10 before | Expand all | Expand 10 after
565 } 567 }
566 568
567 const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request); 569 const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request);
568 if (info) 570 if (info)
569 has_user_gesture = info->HasUserGesture(); 571 has_user_gesture = info->HasUserGesture();
570 } 572 }
571 573
572 DownloadControllerAndroidImpl::DownloadInfoAndroid::~DownloadInfoAndroid() {} 574 DownloadControllerAndroidImpl::DownloadInfoAndroid::~DownloadInfoAndroid() {}
573 575
574 } // namespace content 576 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698