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

Side by Side Diff: webrtc/modules/desktop_capture/mac/full_screen_chrome_window_detector.h

Issue 1579213007: Enable fullscreen windows to be shown in mac window share picker (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Added missing comment Created 4 years, 11 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 /* 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
11 #ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_MAC_FULL_SCREEN_CHROME_WINDOW_DETECTOR_H_ 11 #ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_MAC_FULL_SCREEN_CHROME_WINDOW_DETECTOR_H_
12 #define WEBRTC_MODULES_DESKTOP_CAPTURE_MAC_FULL_SCREEN_CHROME_WINDOW_DETECTOR_H_ 12 #define WEBRTC_MODULES_DESKTOP_CAPTURE_MAC_FULL_SCREEN_CHROME_WINDOW_DETECTOR_H_
13 13
14 #include <ApplicationServices/ApplicationServices.h> 14 #include <ApplicationServices/ApplicationServices.h>
15 15
16 #include "webrtc/modules/desktop_capture/mac/desktop_configuration.h"
16 #include "webrtc/modules/desktop_capture/window_capturer.h" 17 #include "webrtc/modules/desktop_capture/window_capturer.h"
17 #include "webrtc/system_wrappers/include/atomic32.h" 18 #include "webrtc/system_wrappers/include/atomic32.h"
18 #include "webrtc/system_wrappers/include/tick_util.h" 19 #include "webrtc/system_wrappers/include/tick_util.h"
19 20
20 namespace webrtc { 21 namespace webrtc {
21 22
22 // This is a work around for the Chrome tab full-screen behavior: Chrome 23 // This is a work around for the Chrome tab full-screen behavior: Chrome
23 // creates a new window in full-screen mode to show a tab full-screen and 24 // creates a new window in full-screen mode to show a tab full-screen and
24 // minimizes the old window. To continue capturing in this case, we try to 25 // minimizes the old window. To continue capturing in this case, we try to
25 // find the new full-screen window using these criteria: 26 // find the new full-screen window using these criteria:
(...skipping 11 matching lines...) Expand all
37 void AddRef() { ++ref_count_; } 38 void AddRef() { ++ref_count_; }
38 void Release() { 39 void Release() {
39 if (--ref_count_ == 0) 40 if (--ref_count_ == 0)
40 delete this; 41 delete this;
41 } 42 }
42 43
43 // Returns the full-screen window in place of the original window if all the 44 // Returns the full-screen window in place of the original window if all the
44 // criteria are met, or kCGNullWindowID if no such window found. 45 // criteria are met, or kCGNullWindowID if no such window found.
45 CGWindowID FindFullScreenWindow(CGWindowID original_window); 46 CGWindowID FindFullScreenWindow(CGWindowID original_window);
46 47
48 // Returns true if the window is occupying a full screen.
49 static bool IsWindowFullScreen(const MacDesktopConfiguration& desktop_config,
50 CFDictionaryRef window);
GeorgeZ 2016/01/13 21:35:31 Please align the parameters as static bool IsWind
niklas.enbom 2016/01/13 21:56:45 Acknowledged.
51
52 // Returns true if the window is minimized.
53 static bool IsWindowMinimized(CGWindowID id);
54
47 // The caller should call this function periodically, no less than twice per 55 // The caller should call this function periodically, no less than twice per
48 // second. 56 // second.
49 void UpdateWindowListIfNeeded(CGWindowID original_window); 57 void UpdateWindowListIfNeeded(CGWindowID original_window);
50 58
51 private: 59 private:
52 ~FullScreenChromeWindowDetector(); 60 ~FullScreenChromeWindowDetector();
53 61
54 Atomic32 ref_count_; 62 Atomic32 ref_count_;
55 63
56 // We cache the last two results of the window list, so 64 // We cache the last two results of the window list, so
57 // |previous_window_list_| is taken at least 500ms before the next Capture() 65 // |previous_window_list_| is taken at least 500ms before the next Capture()
58 // call. If we only save the last result, we may get false positive (i.e. 66 // call. If we only save the last result, we may get false positive (i.e.
59 // full-screen window exists in the list) if Capture() is called too soon. 67 // full-screen window exists in the list) if Capture() is called too soon.
60 WindowCapturer::WindowList current_window_list_; 68 WindowCapturer::WindowList current_window_list_;
61 WindowCapturer::WindowList previous_window_list_; 69 WindowCapturer::WindowList previous_window_list_;
62 TickTime last_udpate_time_; 70 TickTime last_udpate_time_;
63 71
64 RTC_DISALLOW_COPY_AND_ASSIGN(FullScreenChromeWindowDetector); 72 RTC_DISALLOW_COPY_AND_ASSIGN(FullScreenChromeWindowDetector);
65 }; 73 };
66 74
67 } // namespace webrtc 75 } // namespace webrtc
68 76
69 #endif // WEBRTC_MODULES_DESKTOP_CAPTURE_MAC_FULL_SCREEN_CHROME_WINDOW_DETECTOR _H_ 77 #endif // WEBRTC_MODULES_DESKTOP_CAPTURE_MAC_FULL_SCREEN_CHROME_WINDOW_DETECTOR _H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698