bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Windows: Fix AssertBlockingAllowed failure in GetAzureADJoinStateStorage (fixes issue #3342)

This commit is contained in:
Marshall Greenblatt 2022-06-23 13:59:09 +03:00
parent 335922b64d
commit 1eff0baf94
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libcef/browser/alloy/alloy_browser_main.cc
View File

@ -55,6 +55,7 @@
#include "ui/wm/core/wm_state.h" #include "ui/wm/core/wm_state.h"
#if BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_WIN)
#include "base/enterprise_util.h"
#include "chrome/browser/chrome_browser_main_win.h" #include "chrome/browser/chrome_browser_main_win.h"
#include "chrome/browser/win/parental_controls.h" #include "chrome/browser/win/parental_controls.h"
#endif #endif
@ -308,7 +309,13 @@ int AlloyBrowserMainParts::PreMainMessageLoopRun() {
// Windows parental controls calls can be slow, so we do an early init here // Windows parental controls calls can be slow, so we do an early init here
// that calculates this value off of the UI thread. // that calculates this value off of the UI thread.
InitializeWinParentalControls(); InitializeWinParentalControls();
#endif
// These methods may call LoadLibrary and could trigger
// AssertBlockingAllowed() failures if executed at a later time on the UI
// thread.
base::IsManagedDevice();
base::IsEnterpriseDevice();
#endif // BUILDFLAG(IS_WIN)
// Triggers initialization of the singleton instance on UI thread. // Triggers initialization of the singleton instance on UI thread.
PluginFinder::GetInstance(); PluginFinder::GetInstance();