OLD | NEW |
---|---|
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 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
150 CGWindowID original_window) { | 150 CGWindowID original_window) { |
151 if (!IsChromeWindow(original_window) || !IsWindowMinimized(original_window)) | 151 if (!IsChromeWindow(original_window) || !IsWindowMinimized(original_window)) |
152 return kCGNullWindowID; | 152 return kCGNullWindowID; |
153 | 153 |
154 CGWindowID full_screen_window_id = | 154 CGWindowID full_screen_window_id = |
155 FindFullScreenWindowWithSamePidAndTitle(original_window); | 155 FindFullScreenWindowWithSamePidAndTitle(original_window); |
156 | 156 |
157 if (full_screen_window_id == kCGNullWindowID) | 157 if (full_screen_window_id == kCGNullWindowID) |
158 return kCGNullWindowID; | 158 return kCGNullWindowID; |
159 | 159 |
160 for (WindowCapturer::WindowList::iterator it = previous_window_list_.begin(); | 160 for (auto it = previous_window_list_.begin(); |
Sergey Ulanov
2016/11/07 20:20:56
replace this with a range loop?
Hzj_jie
2016/11/07 23:00:18
Done.
| |
161 it != previous_window_list_.end(); ++it) { | 161 it != previous_window_list_.end(); ++it) { |
162 if (static_cast<CGWindowID>(it->id) != full_screen_window_id) | 162 if (static_cast<CGWindowID>(it->id) != full_screen_window_id) |
163 continue; | 163 continue; |
164 | 164 |
165 LOG(LS_WARNING) << "The full-screen window exists in the list."; | 165 LOG(LS_WARNING) << "The full-screen window exists in the list."; |
166 return kCGNullWindowID; | 166 return kCGNullWindowID; |
167 } | 167 } |
168 | 168 |
169 return full_screen_window_id; | 169 return full_screen_window_id; |
170 } | 170 } |
(...skipping 11 matching lines...) Expand all Loading... | |
182 previous_window_list_.clear(); | 182 previous_window_list_.clear(); |
183 return; | 183 return; |
184 } | 184 } |
185 | 185 |
186 GetWindowList(¤t_window_list_); | 186 GetWindowList(¤t_window_list_); |
187 last_update_time_ns_ = rtc::TimeNanos(); | 187 last_update_time_ns_ = rtc::TimeNanos(); |
188 } | 188 } |
189 } | 189 } |
190 | 190 |
191 } // namespace webrtc | 191 } // namespace webrtc |
OLD | NEW |