Index: ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc |
diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc |
index 36d63c16cc07eb488351ee752ba3909fb2396ff7..36cdff5f36f3857603ea98430d5694eb49cbc9a2 100644 |
--- a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc |
+++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc |
@@ -226,7 +226,8 @@ void DesktopWindowTreeHostX11::CleanUpWindowList() { |
// DesktopWindowTreeHostX11, DesktopWindowTreeHost implementation: |
void DesktopWindowTreeHostX11::Init(aura::Window* content_window, |
- const Widget::InitParams& params) { |
+ const Widget::InitParams& params, |
+ ui::ContextFactory* context_factory) { |
content_window_ = content_window; |
// TODO(erg): Check whether we *should* be building a WindowTreeHost here, or |
@@ -240,7 +241,7 @@ void DesktopWindowTreeHostX11::Init(aura::Window* content_window, |
if (sanitized_params.bounds.height() == 0) |
sanitized_params.bounds.set_height(100); |
- InitX11Window(sanitized_params); |
+ InitX11Window(sanitized_params, context_factory); |
} |
void DesktopWindowTreeHostX11::OnNativeWidgetCreated( |
@@ -936,7 +937,8 @@ ui::EventProcessor* DesktopWindowTreeHostX11::GetEventProcessor() { |
// DesktopWindowTreeHostX11, private: |
void DesktopWindowTreeHostX11::InitX11Window( |
- const Widget::InitParams& params) { |
+ const Widget::InitParams& params, |
+ ui::ContextFactory* context_factory) { |
unsigned long attribute_mask = CWBackPixmap; |
XSetWindowAttributes swa; |
memset(&swa, 0, sizeof(swa)); |
@@ -1120,7 +1122,7 @@ void DesktopWindowTreeHostX11::InitX11Window( |
if (window_icon) { |
SetWindowIcons(gfx::ImageSkia(), *window_icon); |
} |
- CreateCompositor(GetAcceleratedWidget()); |
+ CreateCompositor(GetAcceleratedWidget(), context_factory); |
} |
void DesktopWindowTreeHostX11::OnWMStateUpdated() { |