mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Merge pull request #289 from poiru/windows-wm-state

Browse source 
Initialize wm::WMState on Windows as well
This commit is contained in:
Birunthan Mohanathas 2017-04-16 17:58:41 +03:00 • committed by GitHub
commit 708d39ebe5
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
brightray/browser/browser_main_parts.cc
View file

@ -24,6 +24,7 @@
#include "ui/display/display.h"
#include "ui/display/screen.h"
#include "ui/views/widget/desktop_aura/desktop_screen.h"
#include "ui/wm/core/wm_state.h"
#endif
#if defined(TOOLKIT_VIEWS)
@ -40,7 +41,6 @@
#include "ui/base/x/x11_util.h"
#include "ui/base/x/x11_util_internal.h"
#include "ui/views/linux_ui/linux_ui.h"
#include "ui/wm/core/wm_state.h"
#endif
#if defined(OS_WIN)
@ -178,6 +178,9 @@ void BrowserMainParts::ToolkitInitialized() {
#if defined(USE_AURA) && defined(USE_X11)
views::LinuxUI::instance()->Initialize();
#endif
#if defined(USE_AURA)
wm_state_.reset(new wm::WMState);
#endif

4
brightray/browser/browser_main_parts.h
View file

@ -15,7 +15,7 @@ class ViewsDelegate;
}
#endif
#if defined(USE_AURA) && defined(USE_X11)
#if defined(USE_AURA)
namespace wm {
class WMState;
}
@ -48,7 +48,7 @@ class BrowserMainParts : public content::BrowserMainParts {
std::unique_ptr<ViewsDelegate> views_delegate_;
#endif
#if defined(USE_AURA) && defined(USE_X11)
#if defined(USE_AURA)
std::unique_ptr<wm::WMState> wm_state_;
#endif