Chromium Code Reviews| Index: chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc |
| diff --git a/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc b/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc |
| index c7004cdefb53b5c01dc23d834db9839af4068d71..b66355dd64257c47ffd036b1cfb3647dbb413f62 100644 |
| --- a/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc |
| +++ b/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc |
| @@ -15,6 +15,10 @@ |
| #include "ui/aura/single_monitor_manager.h" |
| #include "ui/gfx/screen.h" |
| #include "ui/views/widget/native_widget_aura.h" |
| +#if defined(OS_LINUX) |
|
sky
2012/06/06 21:04:07
Can you move this into its own block after the ash
|
| +#include "ui/base/linux_ui.h" |
| +#include "chrome/browser/ui/libgtk2ui/gtk2_ui.h" |
| +#endif |
| #endif // !USE_ASH |
| ChromeBrowserMainExtraPartsAura::ChromeBrowserMainExtraPartsAura() { |
| @@ -25,6 +29,11 @@ void ChromeBrowserMainExtraPartsAura::PreProfileInit() { |
| gfx::Screen::SetInstance(aura::CreateDesktopScreen()); |
| aura::Env::GetInstance()->SetMonitorManager(new aura::SingleMonitorManager); |
| stacking_client_.reset(new aura::DesktopStackingClient); |
| + |
| +#if defined(OS_LINUX) |
| + // TODO(erg): Refactor this into a dlopen call when we add a GTK3 port. |
| + ui::LinuxUI::SetInstance(BuildGtk2UI()); |
| +#endif |
| #endif // !USE_ASH |
| } |