diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-11-28 08:46:42 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-11-28 08:46:42 +0100 |
| commit | 4b2ab1d0816683dd53311ecb719ac8ede0d5b327 (patch) | |
| tree | cd0cf3daf7678af3b265ff62edd78cd321e90489 /src/core/browser_main_parts_qt.cpp | |
| parent | bbee17d60ae390a8c2c53d429cfa552f726a6d45 (diff) | |
| parent | ba816f1f5cd5ddb7f5cba32d0c9816bb439dffba (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: Idf2c89bebf5e09855d764808cac487bc4b76faaa
Diffstat (limited to 'src/core/browser_main_parts_qt.cpp')
| -rw-r--r-- | src/core/browser_main_parts_qt.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/core/browser_main_parts_qt.cpp b/src/core/browser_main_parts_qt.cpp index 1cb1ae5a2..273e7b45f 100644 --- a/src/core/browser_main_parts_qt.cpp +++ b/src/core/browser_main_parts_qt.cpp @@ -66,6 +66,10 @@ #include <QOpenGLContext> #endif +#if defined(OS_MACOSX) +#include "ui/base/idle/idle.h" +#endif + #if defined(Q_OS_WIN) #include "ui/display/win/screen_win.h" #else @@ -261,6 +265,11 @@ void BrowserMainPartsQt::PostMainMessageLoopRun() int BrowserMainPartsQt::PreCreateThreads() { base::ThreadRestrictions::SetIOAllowed(true); + +#if defined(OS_MACOSX) + ui::InitIdleMonitor(); +#endif + // Like ChromeBrowserMainExtraPartsViews::PreCreateThreads does. #if defined(Q_OS_WIN) display::Screen::SetScreenInstance(new display::win::ScreenWin); |