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

Windows: Fix loading of cursor resources from DLL (issue #1265). 

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1693 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2014-05-06 17:20:43 +00:00
parent 84382ecbbb
commit 01cba8ccb4
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libcef/browser/browser_main.cc
View File

@ -35,6 +35,10 @@
#include "ui/gfx/screen.h" #include "ui/gfx/screen.h"
#include "ui/views/test/desktop_test_views_delegate.h" #include "ui/views/test/desktop_test_views_delegate.h"
#include "ui/views/widget/desktop_aura/desktop_screen.h" #include "ui/views/widget/desktop_aura/desktop_screen.h"
#if defined(OS_WIN)
#include "ui/base/cursor/cursor_loader_win.h"
#endif
#endif // defined(USE_AURA) #endif // defined(USE_AURA)
CefBrowserMainParts::CefBrowserMainParts( CefBrowserMainParts::CefBrowserMainParts(
@ -60,7 +64,12 @@ void CefBrowserMainParts::ToolkitInitialized() {
DCHECK(!views::ViewsDelegate::views_delegate); DCHECK(!views::ViewsDelegate::views_delegate);
new views::DesktopTestViewsDelegate; new views::DesktopTestViewsDelegate;
#if defined(OS_WIN)
ui::CursorLoaderWin::SetCursorResourceModule(
CefContentBrowserClient::Get()->GetResourceDllName());
#endif #endif
#endif // defined(USE_AURA)
} }
void CefBrowserMainParts::PostMainMessageLoopStart() { void CefBrowserMainParts::PostMainMessageLoopStart() {