bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-02-11 09:30:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Windows: Early init parental controls to avoid blocking assertions

Browse Source
This commit is contained in:
Marshall Greenblatt 2020-04-15 21:26:27 -04:00
parent fa519f5108
commit 245bc9bfab
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libcef/browser/browser_main.cc
View File

@ -51,6 +51,7 @@
#if defined(OS_WIN) #if defined(OS_WIN)
#include "chrome/browser/chrome_browser_main_win.h" #include "chrome/browser/chrome_browser_main_win.h"
#include "chrome/browser/win/parental_controls.h"
#include "components/os_crypt/os_crypt.h" #include "components/os_crypt/os_crypt.h"
#include "ui/base/cursor/cursor_loader_win.h" #include "ui/base/cursor/cursor_loader_win.h"
#endif #endif
@ -200,8 +201,11 @@ void CefBrowserMainParts::PreMainMessageLoopRun() {
CefDevToolsManagerDelegate::StartHttpHandler(browser_context); CefDevToolsManagerDelegate::StartHttpHandler(browser_context);
// Initialize before IO access restrictions are applied. #if defined(OS_WIN)
content::GetNetworkService(); // Windows parental controls calls can be slow, so we do an early init here
// that calculates this value off of the UI thread.
InitializeWinParentalControls();
#endif
// Triggers initialization of the singleton instance on UI thread. // Triggers initialization of the singleton instance on UI thread.
PluginFinder::GetInstance()->Init(); PluginFinder::GetInstance()->Init();