From 01cba8ccb43018c6610951fbe6d6e8c8b93b2c63 Mon Sep 17 00:00:00 2001
From: Marshall Greenblatt <magreenblatt@gmail.com>
Date: Tue, 6 May 2014 17:20:43 +0000
Subject: [PATCH] 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
---
 libcef/browser/browser_main.cc | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/libcef/browser/browser_main.cc b/libcef/browser/browser_main.cc
index d159ae1e0..095f70b5a 100644
--- a/libcef/browser/browser_main.cc
+++ b/libcef/browser/browser_main.cc
@@ -35,6 +35,10 @@
 #include "ui/gfx/screen.h"
 #include "ui/views/test/desktop_test_views_delegate.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)
 
 CefBrowserMainParts::CefBrowserMainParts(
@@ -60,7 +64,12 @@ void CefBrowserMainParts::ToolkitInitialized() {
 
   DCHECK(!views::ViewsDelegate::views_delegate);
   new views::DesktopTestViewsDelegate;
+
+#if defined(OS_WIN)
+  ui::CursorLoaderWin::SetCursorResourceModule(
+      CefContentBrowserClient::Get()->GetResourceDllName());
 #endif
+#endif  // defined(USE_AURA)
 }
 
 void CefBrowserMainParts::PostMainMessageLoopStart() {