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

Side by Side Diff: webrtc/modules/desktop_capture/cropping_window_capturer.cc

Issue 2479553006: Remove GetWindowList / GetScreenList and SelectWindow / SelectScreen from WebRTC (Closed)
Patch Set: Resolve review comments 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
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 } 51 }
52 } 52 }
53 53
54 void CroppingWindowCapturer::SetExcludedWindow(WindowId window) { 54 void CroppingWindowCapturer::SetExcludedWindow(WindowId window) {
55 excluded_window_ = window; 55 excluded_window_ = window;
56 if (screen_capturer_.get()) { 56 if (screen_capturer_.get()) {
57 screen_capturer_->SetExcludedWindow(window); 57 screen_capturer_->SetExcludedWindow(window);
58 } 58 }
59 } 59 }
60 60
61 bool CroppingWindowCapturer::GetWindowList(WindowList* windows) { 61 bool CroppingWindowCapturer::GetSourceList(SourceList* sources) {
62 return window_capturer_->GetWindowList(windows); 62 return window_capturer_->GetSourceList(sources);
63 } 63 }
64 64
65 bool CroppingWindowCapturer::SelectWindow(WindowId id) { 65 bool CroppingWindowCapturer::SelectSource(SourceId id) {
66 if (window_capturer_->SelectWindow(id)) { 66 if (window_capturer_->SelectSource(id)) {
67 selected_window_ = id; 67 selected_window_ = id;
68 return true; 68 return true;
69 } 69 }
70 return false; 70 return false;
71 } 71 }
72 72
73 bool CroppingWindowCapturer::BringSelectedWindowToFront() { 73 bool CroppingWindowCapturer::FocusOnSelectedSource() {
74 return window_capturer_->BringSelectedWindowToFront(); 74 return window_capturer_->FocusOnSelectedSource();
75 } 75 }
76 76
77 void CroppingWindowCapturer::OnCaptureResult( 77 void CroppingWindowCapturer::OnCaptureResult(
78 DesktopCapturer::Result result, 78 DesktopCapturer::Result result,
79 std::unique_ptr<DesktopFrame> screen_frame) { 79 std::unique_ptr<DesktopFrame> screen_frame) {
80 if (!ShouldUseScreenCapturer()) { 80 if (!ShouldUseScreenCapturer()) {
81 LOG(LS_INFO) << "Window no longer on top when ScreenCapturer finishes"; 81 LOG(LS_INFO) << "Window no longer on top when ScreenCapturer finishes";
82 window_capturer_->CaptureFrame(); 82 window_capturer_->CaptureFrame();
83 return; 83 return;
84 } 84 }
(...skipping 18 matching lines...) Expand all
103 103
104 #if !defined(WEBRTC_WIN) 104 #if !defined(WEBRTC_WIN)
105 // static 105 // static
106 WindowCapturer* 106 WindowCapturer*
107 CroppingWindowCapturer::Create(const DesktopCaptureOptions& options) { 107 CroppingWindowCapturer::Create(const DesktopCaptureOptions& options) {
108 return WindowCapturer::Create(options); 108 return WindowCapturer::Create(options);
109 } 109 }
110 #endif 110 #endif
111 111
112 } // namespace webrtc 112 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/desktop_capture/cropping_window_capturer.h ('k') | webrtc/modules/desktop_capture/desktop_capturer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698