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

Side by Side Diff: chrome/browser/ui/webui/media_router/media_router_ui.cc

Issue 1550053002: Convert Pass()→std::move() in //chrome/browser/ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "chrome/browser/ui/webui/media_router/media_router_ui.h" 5 #include "chrome/browser/ui/webui/media_router/media_router_ui.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <utility>
9 10
10 #include "base/guid.h" 11 #include "base/guid.h"
11 #include "base/i18n/string_compare.h" 12 #include "base/i18n/string_compare.h"
12 #include "base/macros.h" 13 #include "base/macros.h"
13 #include "base/strings/string_util.h" 14 #include "base/strings/string_util.h"
14 #include "base/strings/utf_string_conversions.h" 15 #include "base/strings/utf_string_conversions.h"
15 #include "base/trace_event/trace_event.h" 16 #include "base/trace_event/trace_event.h"
16 #include "chrome/browser/browser_process.h" 17 #include "chrome/browser/browser_process.h"
17 #include "chrome/browser/media/router/create_presentation_connection_request.h" 18 #include "chrome/browser/media/router/create_presentation_connection_request.h"
18 #include "chrome/browser/media/router/issue.h" 19 #include "chrome/browser/media/router/issue.h"
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 203
203 void MediaRouterUI::InitWithPresentationSessionRequest( 204 void MediaRouterUI::InitWithPresentationSessionRequest(
204 content::WebContents* initiator, 205 content::WebContents* initiator,
205 const base::WeakPtr<PresentationServiceDelegateImpl>& delegate, 206 const base::WeakPtr<PresentationServiceDelegateImpl>& delegate,
206 scoped_ptr<CreatePresentationConnectionRequest> create_session_request) { 207 scoped_ptr<CreatePresentationConnectionRequest> create_session_request) {
207 DCHECK(initiator); 208 DCHECK(initiator);
208 DCHECK(create_session_request); 209 DCHECK(create_session_request);
209 DCHECK(!create_session_request_); 210 DCHECK(!create_session_request_);
210 DCHECK(!query_result_manager_); 211 DCHECK(!query_result_manager_);
211 212
212 create_session_request_ = create_session_request.Pass(); 213 create_session_request_ = std::move(create_session_request);
213 presentation_service_delegate_ = delegate; 214 presentation_service_delegate_ = delegate;
214 InitCommon(initiator); 215 InitCommon(initiator);
215 OnDefaultPresentationChanged(create_session_request_->presentation_request()); 216 OnDefaultPresentationChanged(create_session_request_->presentation_request());
216 } 217 }
217 218
218 void MediaRouterUI::InitCommon(content::WebContents* initiator) { 219 void MediaRouterUI::InitCommon(content::WebContents* initiator) {
219 DCHECK(initiator); 220 DCHECK(initiator);
220 DCHECK(router_); 221 DCHECK(router_);
221 222
222 TRACE_EVENT_NESTABLE_ASYNC_INSTANT1("media_router", "UI", initiator, 223 TRACE_EVENT_NESTABLE_ASYNC_INSTANT1("media_router", "UI", initiator,
(...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after
497 498
498 void MediaRouterUI::OnUIInitialDataReceived() { 499 void MediaRouterUI::OnUIInitialDataReceived() {
499 if (!start_time_.is_null()) { 500 if (!start_time_.is_null()) {
500 MediaRouterMetrics::RecordMediaRouterDialogLoaded( 501 MediaRouterMetrics::RecordMediaRouterDialogLoaded(
501 base::Time::Now() - start_time_); 502 base::Time::Now() - start_time_);
502 start_time_ = base::Time(); 503 start_time_ = base::Time();
503 } 504 }
504 } 505 }
505 506
506 } // namespace media_router 507 } // namespace media_router
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698