| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2013 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 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 143 return true; | 143 return true; |
| 144 } | 144 } |
| 145 | 145 |
| 146 bool WindowCapturerWin::BringSelectedWindowToFront() { | 146 bool WindowCapturerWin::BringSelectedWindowToFront() { |
| 147 if (!window_) | 147 if (!window_) |
| 148 return false; | 148 return false; |
| 149 | 149 |
| 150 if (!IsWindow(window_) || !IsWindowVisible(window_) || IsIconic(window_)) | 150 if (!IsWindow(window_) || !IsWindowVisible(window_) || IsIconic(window_)) |
| 151 return false; | 151 return false; |
| 152 | 152 |
| 153 return SetForegroundWindow(window_) != 0; | 153 return BringWindowToTop(window_) != FALSE && |
| 154 SetForegroundWindow(window_) != FALSE; |
| 154 } | 155 } |
| 155 | 156 |
| 156 void WindowCapturerWin::Start(Callback* callback) { | 157 void WindowCapturerWin::Start(Callback* callback) { |
| 157 assert(!callback_); | 158 assert(!callback_); |
| 158 assert(callback); | 159 assert(callback); |
| 159 | 160 |
| 160 callback_ = callback; | 161 callback_ = callback; |
| 161 } | 162 } |
| 162 | 163 |
| 163 void WindowCapturerWin::CaptureFrame() { | 164 void WindowCapturerWin::CaptureFrame() { |
| (...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 263 } | 264 } |
| 264 | 265 |
| 265 } // namespace | 266 } // namespace |
| 266 | 267 |
| 267 // static | 268 // static |
| 268 WindowCapturer* WindowCapturer::Create(const DesktopCaptureOptions& options) { | 269 WindowCapturer* WindowCapturer::Create(const DesktopCaptureOptions& options) { |
| 269 return new WindowCapturerWin(); | 270 return new WindowCapturerWin(); |
| 270 } | 271 } |
| 271 | 272 |
| 272 } // namespace webrtc | 273 } // namespace webrtc |
| OLD | NEW |