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

Side by Side Diff: chrome/browser/media/webrtc/media_capture_devices_dispatcher.cc

Issue 2426223002: Reduce FOR_EACH_OBSERVER macro usage in chrome/browser (Closed)
Patch Set: Created 4 years, 2 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 "chrome/browser/media/webrtc/media_capture_devices_dispatcher.h" 5 #include "chrome/browser/media/webrtc/media_capture_devices_dispatcher.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/metrics/field_trial.h" 9 #include "base/metrics/field_trial.h"
10 #include "base/strings/string_number_conversions.h" 10 #include "base/strings/string_number_conversions.h"
(...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after
315 DCHECK_CURRENTLY_ON(BrowserThread::IO); 315 DCHECK_CURRENTLY_ON(BrowserThread::IO);
316 BrowserThread::PostTask( 316 BrowserThread::PostTask(
317 BrowserThread::UI, FROM_HERE, 317 BrowserThread::UI, FROM_HERE,
318 base::Bind( 318 base::Bind(
319 &MediaCaptureDevicesDispatcher::OnCreatingAudioStreamOnUIThread, 319 &MediaCaptureDevicesDispatcher::OnCreatingAudioStreamOnUIThread,
320 base::Unretained(this), render_process_id, render_frame_id)); 320 base::Unretained(this), render_process_id, render_frame_id));
321 } 321 }
322 322
323 void MediaCaptureDevicesDispatcher::NotifyAudioDevicesChangedOnUIThread() { 323 void MediaCaptureDevicesDispatcher::NotifyAudioDevicesChangedOnUIThread() {
324 MediaStreamDevices devices = GetAudioCaptureDevices(); 324 MediaStreamDevices devices = GetAudioCaptureDevices();
325 FOR_EACH_OBSERVER(Observer, observers_, 325 for (auto& observer : observers_)
326 OnUpdateAudioDevices(devices)); 326 observer.OnUpdateAudioDevices(devices);
327 } 327 }
328 328
329 void MediaCaptureDevicesDispatcher::NotifyVideoDevicesChangedOnUIThread() { 329 void MediaCaptureDevicesDispatcher::NotifyVideoDevicesChangedOnUIThread() {
330 MediaStreamDevices devices = GetVideoCaptureDevices(); 330 MediaStreamDevices devices = GetVideoCaptureDevices();
331 FOR_EACH_OBSERVER(Observer, observers_, 331 for (auto& observer : observers_)
332 OnUpdateVideoDevices(devices)); 332 observer.OnUpdateVideoDevices(devices);
333 } 333 }
334 334
335 void MediaCaptureDevicesDispatcher::UpdateMediaRequestStateOnUIThread( 335 void MediaCaptureDevicesDispatcher::UpdateMediaRequestStateOnUIThread(
336 int render_process_id, 336 int render_process_id,
337 int render_frame_id, 337 int render_frame_id,
338 int page_request_id, 338 int page_request_id,
339 const GURL& security_origin, 339 const GURL& security_origin,
340 content::MediaStreamType stream_type, 340 content::MediaStreamType stream_type,
341 content::MediaRequestState state) { 341 content::MediaRequestState state) {
342 for (MediaAccessHandler* handler : media_access_handlers_) { 342 for (MediaAccessHandler* handler : media_access_handlers_) {
343 if (handler->SupportsStreamType(stream_type, nullptr)) { 343 if (handler->SupportsStreamType(stream_type, nullptr)) {
344 handler->UpdateMediaRequestState(render_process_id, render_frame_id, 344 handler->UpdateMediaRequestState(render_process_id, render_frame_id,
345 page_request_id, stream_type, state); 345 page_request_id, stream_type, state);
346 break; 346 break;
347 } 347 }
348 } 348 }
349 349
350 #if defined(OS_CHROMEOS) 350 #if defined(OS_CHROMEOS)
351 if (IsOriginForCasting(security_origin) && IsVideoMediaType(stream_type)) { 351 if (IsOriginForCasting(security_origin) && IsVideoMediaType(stream_type)) {
352 // Notify ash that casting state has changed. 352 // Notify ash that casting state has changed.
353 if (state == content::MEDIA_REQUEST_STATE_DONE) { 353 if (state == content::MEDIA_REQUEST_STATE_DONE) {
354 ash::Shell::GetInstance()->OnCastingSessionStartedOrStopped(true); 354 ash::Shell::GetInstance()->OnCastingSessionStartedOrStopped(true);
355 } else if (state == content::MEDIA_REQUEST_STATE_CLOSING) { 355 } else if (state == content::MEDIA_REQUEST_STATE_CLOSING) {
356 ash::Shell::GetInstance()->OnCastingSessionStartedOrStopped(false); 356 ash::Shell::GetInstance()->OnCastingSessionStartedOrStopped(false);
357 } 357 }
358 } 358 }
359 #endif 359 #endif
360 360
361 FOR_EACH_OBSERVER(Observer, observers_, 361 for (auto& observer : observers_) {
362 OnRequestUpdate(render_process_id, 362 observer.OnRequestUpdate(render_process_id, render_frame_id, stream_type,
363 render_frame_id, 363 state);
364 stream_type, 364 }
365 state));
366 } 365 }
367 366
368 void MediaCaptureDevicesDispatcher::OnCreatingAudioStreamOnUIThread( 367 void MediaCaptureDevicesDispatcher::OnCreatingAudioStreamOnUIThread(
369 int render_process_id, 368 int render_process_id,
370 int render_frame_id) { 369 int render_frame_id) {
371 DCHECK_CURRENTLY_ON(BrowserThread::UI); 370 DCHECK_CURRENTLY_ON(BrowserThread::UI);
372 FOR_EACH_OBSERVER(Observer, observers_, 371 for (auto& observer : observers_)
373 OnCreatingAudioStream(render_process_id, render_frame_id)); 372 observer.OnCreatingAudioStream(render_process_id, render_frame_id);
374 } 373 }
375 374
376 bool MediaCaptureDevicesDispatcher::IsInsecureCapturingInProgress( 375 bool MediaCaptureDevicesDispatcher::IsInsecureCapturingInProgress(
377 int render_process_id, 376 int render_process_id,
378 int render_frame_id) { 377 int render_frame_id) {
379 DCHECK_CURRENTLY_ON(BrowserThread::UI); 378 DCHECK_CURRENTLY_ON(BrowserThread::UI);
380 #if defined(ENABLE_EXTENSIONS) 379 #if defined(ENABLE_EXTENSIONS)
381 for (MediaAccessHandler* handler : media_access_handlers_) { 380 for (MediaAccessHandler* handler : media_access_handlers_) {
382 if (handler->SupportsStreamType(content::MEDIA_DESKTOP_VIDEO_CAPTURE, 381 if (handler->SupportsStreamType(content::MEDIA_DESKTOP_VIDEO_CAPTURE,
383 nullptr) || 382 nullptr) ||
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
434 #if defined(ENABLE_EXTENSIONS) 433 #if defined(ENABLE_EXTENSIONS)
435 for (MediaAccessHandler* handler : media_access_handlers_) { 434 for (MediaAccessHandler* handler : media_access_handlers_) {
436 if (handler->SupportsStreamType(stream_type, nullptr)) { 435 if (handler->SupportsStreamType(stream_type, nullptr)) {
437 ToCaptureAccessHandlerBase(handler)->UpdateCapturingLinkSecured( 436 ToCaptureAccessHandlerBase(handler)->UpdateCapturingLinkSecured(
438 render_process_id, render_frame_id, page_request_id, is_secure); 437 render_process_id, render_frame_id, page_request_id, is_secure);
439 break; 438 break;
440 } 439 }
441 } 440 }
442 #endif 441 #endif
443 } 442 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698