Windows: Fix loading of cursor resources from DLL (issue #1265).
git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/1916@1694 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
parent
054ee79533
commit
9440210129
|
@ -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() {
|
||||||
|
|
Loading…
Reference in New Issue