diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-29 10:46:47 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-11-02 12:02:10 +0000 |
| commit | 99677208ff3b216fdfec551fbe548da5520cd6fb (patch) | |
| tree | 476a4865c10320249360e859d8fdd3e01833b03a /chromium/content/browser/browser_main_loop.h | |
| parent | c30a6232df03e1efbd9f3b226777b07e087a1122 (diff) | |
| download | qtwebengine-chromium-99677208ff3b216fdfec551fbe548da5520cd6fb.tar.gz | |
BASELINE: Update Chromium to 86.0.4240.124
Change-Id: Ide0ff151e94cd665ae6521a446995d34a9d1d644
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/content/browser/browser_main_loop.h')
| -rw-r--r-- | chromium/content/browser/browser_main_loop.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/chromium/content/browser/browser_main_loop.h b/chromium/content/browser/browser_main_loop.h index affe516c1aa..67326c04440 100644 --- a/chromium/content/browser/browser_main_loop.h +++ b/chromium/content/browser/browser_main_loop.h @@ -50,11 +50,11 @@ class AudioManager; class AudioSystem; #if defined(OS_WIN) class SystemMessageWindowWin; -#elif defined(OS_LINUX) && defined(USE_UDEV) +#elif (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(USE_UDEV) class DeviceMonitorLinux; #endif class UserInputMonitor; -#if defined(OS_MACOSX) +#if defined(OS_MAC) class DeviceMonitorMac; #endif } // namespace media @@ -210,7 +210,7 @@ class CONTENT_EXPORT BrowserMainLoop { void GetCompositingModeReporter( mojo::PendingReceiver<viz::mojom::CompositingModeReporter> receiver); -#if defined(OS_MACOSX) && !defined(OS_IOS) +#if defined(OS_MAC) media::DeviceMonitorMac* device_monitor_mac() const { return device_monitor_mac_.get(); } @@ -293,7 +293,8 @@ class CONTENT_EXPORT BrowserMainLoop { base::Optional<base::ThreadPoolInstance::ScopedBestEffortExecutionFence> scoped_best_effort_execution_fence_; - // Members initialized in |MainMessageLoopStart()| --------------------------- + // Unregister UI thread from hang watching on destruction. + base::ScopedClosureRunner unregister_thread_closure_; // Members initialized in |PostMainMessageLoopStart()| ----------------------- std::unique_ptr<BrowserProcessSubThread> io_thread_; @@ -376,9 +377,9 @@ class CONTENT_EXPORT BrowserMainLoop { #if defined(OS_WIN) std::unique_ptr<media::SystemMessageWindowWin> system_message_window_; -#elif defined(OS_LINUX) && defined(USE_UDEV) +#elif (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(USE_UDEV) std::unique_ptr<media::DeviceMonitorLinux> device_monitor_linux_; -#elif defined(OS_MACOSX) && !defined(OS_IOS) +#elif defined(OS_MAC) std::unique_ptr<media::DeviceMonitorMac> device_monitor_mac_; #endif |