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

Side by Side Diff: content/browser/service_worker/service_worker_fetch_dispatcher.cc

Issue 1545243002: Convert Pass()→std::move() in //content/browser (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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 "content/browser/service_worker/service_worker_fetch_dispatcher.h" 5 #include "content/browser/service_worker/service_worker_fetch_dispatcher.h"
6 6
7 #include <utility>
8
7 #include "base/bind.h" 9 #include "base/bind.h"
8 #include "base/trace_event/trace_event.h" 10 #include "base/trace_event/trace_event.h"
9 #include "content/browser/service_worker/service_worker_version.h" 11 #include "content/browser/service_worker/service_worker_version.h"
10 12
11 namespace content { 13 namespace content {
12 14
13 ServiceWorkerFetchDispatcher::ServiceWorkerFetchDispatcher( 15 ServiceWorkerFetchDispatcher::ServiceWorkerFetchDispatcher(
14 scoped_ptr<ServiceWorkerFetchRequest> request, 16 scoped_ptr<ServiceWorkerFetchRequest> request,
15 ServiceWorkerVersion* version, 17 ServiceWorkerVersion* version,
16 const base::Closure& prepare_callback, 18 const base::Closure& prepare_callback,
17 const FetchCallback& fetch_callback) 19 const FetchCallback& fetch_callback)
18 : version_(version), 20 : version_(version),
19 prepare_callback_(prepare_callback), 21 prepare_callback_(prepare_callback),
20 fetch_callback_(fetch_callback), 22 fetch_callback_(fetch_callback),
21 request_(request.Pass()), 23 request_(std::move(request)),
22 weak_factory_(this) { 24 weak_factory_(this) {}
23 }
24 25
25 ServiceWorkerFetchDispatcher::~ServiceWorkerFetchDispatcher() {} 26 ServiceWorkerFetchDispatcher::~ServiceWorkerFetchDispatcher() {}
26 27
27 void ServiceWorkerFetchDispatcher::Run() { 28 void ServiceWorkerFetchDispatcher::Run() {
28 DCHECK(version_->status() == ServiceWorkerVersion::ACTIVATING || 29 DCHECK(version_->status() == ServiceWorkerVersion::ACTIVATING ||
29 version_->status() == ServiceWorkerVersion::ACTIVATED) 30 version_->status() == ServiceWorkerVersion::ACTIVATED)
30 << version_->status(); 31 << version_->status();
31 32
32 if (version_->status() == ServiceWorkerVersion::ACTIVATING) { 33 if (version_->status() == ServiceWorkerVersion::ACTIVATING) {
33 version_->RegisterStatusChangeCallback( 34 version_->RegisterStatusChangeCallback(
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 TRACE_EVENT_ASYNC_END0( 84 TRACE_EVENT_ASYNC_END0(
84 "ServiceWorker", 85 "ServiceWorker",
85 "ServiceWorkerFetchDispatcher::DispatchFetchEvent", 86 "ServiceWorkerFetchDispatcher::DispatchFetchEvent",
86 request_.get()); 87 request_.get());
87 DCHECK(!fetch_callback_.is_null()); 88 DCHECK(!fetch_callback_.is_null());
88 FetchCallback fetch_callback = fetch_callback_; 89 FetchCallback fetch_callback = fetch_callback_;
89 fetch_callback.Run(status, fetch_result, response, version_); 90 fetch_callback.Run(status, fetch_result, response, version_);
90 } 91 }
91 92
92 } // namespace content 93 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698