bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-02-21 22:47:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

alloy: win: Fix loading of some mouse cursors (fixes issue #3174)

Browse Source
This commit is contained in:
Alex Maitland 2021-09-22 09:17:27 +00:00 committed by Marshall Greenblatt
parent 0cee138670
commit 28599ae1a5
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libcef/common/alloy/alloy_main_delegate.cc
View File

@ -49,6 +49,10 @@
#include "libcef/common/util_mac.h" #include "libcef/common/util_mac.h"
#endif #endif
#if defined(OS_WIN)
#include "ui/base/resource/resource_bundle_win.h"
#endif
namespace { namespace {
const char* const kNonWildcardDomainNonPortSchemes[] = { const char* const kNonWildcardDomainNonPortSchemes[] = {
@ -491,6 +495,20 @@ void AlloyMainDelegate::InitializeResourceBundle() {
if (!locales_dir.empty()) if (!locales_dir.empty())
base::PathService::Override(ui::DIR_LOCALES, locales_dir); base::PathService::Override(ui::DIR_LOCALES, locales_dir);
} }
#if defined(OS_WIN)
// From chrome/app/chrome_main_delegate.cc
// Throbber icons and cursors are still stored in chrome.dll,
// this can be killed once those are merged into resources.pak. See
// GlassBrowserFrameView::InitThrobberIcons(), https://crbug.com/368327 and
// https://crbug.com/1178117.
auto module_handle =
::GetModuleHandle(CefAppManager::Get()->GetResourceDllName());
if (!module_handle)
module_handle = ::GetModuleHandle(NULL);
ui::SetResourcesDataDLL(module_handle);
#endif
std::string locale = command_line->GetSwitchValueASCII(switches::kLang); std::string locale = command_line->GetSwitchValueASCII(switches::kLang);
DCHECK(!locale.empty()); DCHECK(!locale.empty());