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

Side by Side Diff: content/browser/media/capture/desktop_capture_device.cc

Issue 2504963003: Replace CroppingWindowCapturer::Create with CroppingWindowCapturer::CreateCapturer (Closed)
Patch Set: Created 4 years, 1 month 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/media/capture/desktop_capture_device.h" 5 #include "content/browser/media/capture/desktop_capture_device.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 #include <string.h> 9 #include <string.h>
10 #include <utility> 10 #include <utility>
(...skipping 380 matching lines...) Expand 10 before | Expand all | Expand 10 after
391 webrtc::MouseCursorMonitor::CreateForScreen(options, source.id))); 391 webrtc::MouseCursorMonitor::CreateForScreen(options, source.id)));
392 IncrementDesktopCaptureCounter(SCREEN_CAPTURER_CREATED); 392 IncrementDesktopCaptureCounter(SCREEN_CAPTURER_CREATED);
393 IncrementDesktopCaptureCounter( 393 IncrementDesktopCaptureCounter(
394 source.audio_share ? SCREEN_CAPTURER_CREATED_WITH_AUDIO 394 source.audio_share ? SCREEN_CAPTURER_CREATED_WITH_AUDIO
395 : SCREEN_CAPTURER_CREATED_WITHOUT_AUDIO); 395 : SCREEN_CAPTURER_CREATED_WITHOUT_AUDIO);
396 } 396 }
397 break; 397 break;
398 } 398 }
399 399
400 case DesktopMediaID::TYPE_WINDOW: { 400 case DesktopMediaID::TYPE_WINDOW: {
401 std::unique_ptr<webrtc::DesktopCapturer> window_capturer( 401 std::unique_ptr<webrtc::DesktopCapturer> window_capturer =
402 webrtc::CroppingWindowCapturer::Create(options)); 402 webrtc::CroppingWindowCapturer::CreateCapturer(options);
403 if (window_capturer && window_capturer->SelectSource(source.id)) { 403 if (window_capturer && window_capturer->SelectSource(source.id)) {
404 window_capturer->FocusOnSelectedSource(); 404 window_capturer->FocusOnSelectedSource();
405 capturer.reset(new webrtc::DesktopAndCursorComposer( 405 capturer.reset(new webrtc::DesktopAndCursorComposer(
406 window_capturer.release(), 406 window_capturer.release(),
407 webrtc::MouseCursorMonitor::CreateForWindow(options, source.id))); 407 webrtc::MouseCursorMonitor::CreateForWindow(options, source.id)));
408 IncrementDesktopCaptureCounter(WINDOW_CAPTURER_CREATED); 408 IncrementDesktopCaptureCounter(WINDOW_CAPTURER_CREATED);
409 } 409 }
410 break; 410 break;
411 } 411 }
412 412
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
462 #else 462 #else
463 base::MessageLoop::Type thread_type = base::MessageLoop::TYPE_DEFAULT; 463 base::MessageLoop::Type thread_type = base::MessageLoop::TYPE_DEFAULT;
464 #endif 464 #endif
465 465
466 thread_.StartWithOptions(base::Thread::Options(thread_type, 0)); 466 thread_.StartWithOptions(base::Thread::Options(thread_type, 0));
467 467
468 core_.reset(new Core(thread_.task_runner(), std::move(capturer), type)); 468 core_.reset(new Core(thread_.task_runner(), std::move(capturer), type));
469 } 469 }
470 470
471 } // namespace content 471 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698