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

Side by Side Diff: chrome/browser/media/router/presentation_service_delegate_impl.cc

Issue 2161193003: Use __func__ instead of __FUNCTION__. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Resync Created 4 years, 4 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/media/router/presentation_service_delegate_impl.h" 5 #include "chrome/browser/media/router/presentation_service_delegate_impl.h"
6 6
7 #include <string> 7 #include <string>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
229 // We keep the PresentationConnectionStateChangedCallback registered with MR 229 // We keep the PresentationConnectionStateChangedCallback registered with MR
230 // so the MRP can tell us when terminate() completed. 230 // so the MRP can tell us when terminate() completed.
231 } 231 }
232 232
233 void PresentationFrame::ListenForConnectionStateChange( 233 void PresentationFrame::ListenForConnectionStateChange(
234 const content::PresentationSessionInfo& connection, 234 const content::PresentationSessionInfo& connection,
235 const content::PresentationConnectionStateChangedCallback& 235 const content::PresentationConnectionStateChangedCallback&
236 state_changed_cb) { 236 state_changed_cb) {
237 auto it = presentation_id_to_route_id_.find(connection.presentation_id); 237 auto it = presentation_id_to_route_id_.find(connection.presentation_id);
238 if (it == presentation_id_to_route_id_.end()) { 238 if (it == presentation_id_to_route_id_.end()) {
239 DLOG(ERROR) << __FUNCTION__ << "route id not found for presentation: " 239 DLOG(ERROR) << __func__ << "route id not found for presentation: "
240 << connection.presentation_id; 240 << connection.presentation_id;
241 return; 241 return;
242 } 242 }
243 243
244 const MediaRoute::Id& route_id = it->second; 244 const MediaRoute::Id& route_id = it->second;
245 if (connection_state_subscriptions_.contains(route_id)) { 245 if (connection_state_subscriptions_.contains(route_id)) {
246 DLOG(ERROR) << __FUNCTION__ << "Already listening connection state change " 246 DLOG(ERROR) << __func__
247 "for route: " 247 << "Already listening connection state change for route: "
248 << route_id; 248 << route_id;
249 return; 249 return;
250 } 250 }
251 251
252 connection_state_subscriptions_.add( 252 connection_state_subscriptions_.add(
253 route_id, router_->AddPresentationConnectionStateChangedCallback( 253 route_id, router_->AddPresentationConnectionStateChangedCallback(
254 it->second, state_changed_cb)); 254 it->second, state_changed_cb));
255 } 255 }
256 256
257 void PresentationFrame::ListenForSessionMessages( 257 void PresentationFrame::ListenForSessionMessages(
(...skipping 630 matching lines...) Expand 10 before | Expand all | Expand 10 after
888 bool PresentationServiceDelegateImpl::HasScreenAvailabilityListenerForTest( 888 bool PresentationServiceDelegateImpl::HasScreenAvailabilityListenerForTest(
889 int render_process_id, 889 int render_process_id,
890 int render_frame_id, 890 int render_frame_id,
891 const MediaSource::Id& source_id) const { 891 const MediaSource::Id& source_id) const {
892 RenderFrameHostId render_frame_host_id(render_process_id, render_frame_id); 892 RenderFrameHostId render_frame_host_id(render_process_id, render_frame_id);
893 return frame_manager_->HasScreenAvailabilityListenerForTest( 893 return frame_manager_->HasScreenAvailabilityListenerForTest(
894 render_frame_host_id, source_id); 894 render_frame_host_id, source_id);
895 } 895 }
896 896
897 } // namespace media_router 897 } // namespace media_router
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698