Commit f2b988a0 authored by Marshall Greenblatt's avatar Marshall Greenblatt

Windows: Fix crash on touch press text selection (issue #2149)

parent 10fccbd6
......@@ -45,6 +45,7 @@
#include "ui/display/screen.h"
#include "ui/views/test/desktop_test_views_delegate.h"
#include "ui/views/widget/desktop_aura/desktop_screen.h"
#include "ui/wm/core/wm_state.h"
#if defined(OS_WIN)
#include "libcef/common/crash_reporting_win.h"
......@@ -134,6 +135,8 @@ void CefBrowserMainParts::ToolkitInitialized() {
new views::DesktopTestViewsDelegate;
wm_state_.reset(new wm::WMState);
#if defined(OS_WIN)
ui::CursorLoaderWin::SetCursorResourceModule(
CefContentBrowserClient::Get()->GetResourceDllName());
......
......@@ -30,6 +30,12 @@ class ExtensionsBrowserClient;
class ExtensionsClient;
}
#if defined(USE_AURA)
namespace wm {
class WMState;
}
#endif
class CefBrowserContextImpl;
class CefDevToolsDelegate;
......@@ -66,6 +72,10 @@ class CefBrowserMainParts : public content::BrowserMainParts {
std::unique_ptr<extensions::ExtensionsClient> extensions_client_;
std::unique_ptr<extensions::ExtensionsBrowserClient> extensions_browser_client_;
#if defined(USE_AURA)
std::unique_ptr<wm::WMState> wm_state_;
#endif
DISALLOW_COPY_AND_ASSIGN(CefBrowserMainParts);
};
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment