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

Initialize Linux UI.

Browse source
This commit is contained in:
Cheng Zhao 2014-07-03 08:28:14 +00:00
parent d4e81da19a
commit 48ed03eb39
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
brightray/browser/browser_main_parts.cc
View file

@ -10,6 +10,11 @@
#include "ui/gfx/screen.h" #include "ui/gfx/screen.h"
#include "ui/views/widget/desktop_aura/desktop_screen.h" #include "ui/views/widget/desktop_aura/desktop_screen.h"
#if defined(USE_AURA) && defined(USE_X11)
#include "chrome/browser/ui/libgtk2ui/gtk2_ui.h"
#include "ui/views/linux_ui/linux_ui.h"
#endif
namespace brightray { namespace brightray {
BrowserMainParts::BrowserMainParts() { BrowserMainParts::BrowserMainParts() {
@ -22,9 +27,16 @@ void BrowserMainParts::PreEarlyInitialization() {
#if defined(OS_MACOSX) #if defined(OS_MACOSX)
IncreaseFileDescriptorLimit(); IncreaseFileDescriptorLimit();
#endif #endif
#if defined(USE_AURA) && defined(USE_X11)
views::LinuxUI::SetInstance(BuildGtk2UI());
#endif
} }
void BrowserMainParts::ToolkitInitialized() { void BrowserMainParts::ToolkitInitialized() {
#if defined(USE_AURA) && defined(USE_X11)
views::LinuxUI::instance()->Initialize();
#endif
} }
void BrowserMainParts::PreMainMessageLoopStart() { void BrowserMainParts::PreMainMessageLoopStart() {