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

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

Browse Source
This commit is contained in:
Marshall Greenblatt 2017-04-26 12:49:30 -04:00
parent 10fccbd6cf
commit f2b988a0ce
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libcef/browser/browser_main.cc
View File

@ -45,6 +45,7 @@
#include "ui/display/screen.h" #include "ui/display/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"
#include "ui/wm/core/wm_state.h"
#if defined(OS_WIN) #if defined(OS_WIN)
#include "libcef/common/crash_reporting_win.h" #include "libcef/common/crash_reporting_win.h"
@ -134,6 +135,8 @@ void CefBrowserMainParts::ToolkitInitialized() {
new views::DesktopTestViewsDelegate; new views::DesktopTestViewsDelegate;
wm_state_.reset(new wm::WMState);
#if defined(OS_WIN) #if defined(OS_WIN)
ui::CursorLoaderWin::SetCursorResourceModule( ui::CursorLoaderWin::SetCursorResourceModule(
CefContentBrowserClient::Get()->GetResourceDllName()); CefContentBrowserClient::Get()->GetResourceDllName());

10
libcef/browser/browser_main.h
View File

@ -30,6 +30,12 @@ class ExtensionsBrowserClient;
class ExtensionsClient; class ExtensionsClient;
} }
#if defined(USE_AURA)
namespace wm {
class WMState;
}
#endif
class CefBrowserContextImpl; class CefBrowserContextImpl;
class CefDevToolsDelegate; class CefDevToolsDelegate;
@ -66,6 +72,10 @@ class CefBrowserMainParts : public content::BrowserMainParts {
std::unique_ptr<extensions::ExtensionsClient> extensions_client_; std::unique_ptr<extensions::ExtensionsClient> extensions_client_;
std::unique_ptr<extensions::ExtensionsBrowserClient> extensions_browser_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); DISALLOW_COPY_AND_ASSIGN(CefBrowserMainParts);
}; };