| Index: blimp/client/app/linux/blimp_display_manager.cc
|
| diff --git a/blimp/client/app/linux/blimp_display_manager.cc b/blimp/client/app/linux/blimp_display_manager.cc
|
| index 79124999ca3dab260cedfd4e4e49bbb5db2a4f32..882c06bd232dd5b354cd995648948ac40e3022eb 100644
|
| --- a/blimp/client/app/linux/blimp_display_manager.cc
|
| +++ b/blimp/client/app/linux/blimp_display_manager.cc
|
| @@ -4,7 +4,6 @@
|
|
|
| #include "blimp/client/app/linux/blimp_display_manager.h"
|
|
|
| -#include "blimp/client/feature/compositor/blimp_compositor_manager.h"
|
| #include "blimp/client/feature/render_widget_feature.h"
|
| #include "blimp/client/feature/tab_control_feature.h"
|
| #include "ui/events/event.h"
|
| @@ -24,7 +23,7 @@ BlimpDisplayManager::BlimpDisplayManager(
|
| delegate_(delegate),
|
| tab_control_feature_(tab_control_feature),
|
| blimp_compositor_manager_(
|
| - new BlimpCompositorManager(render_widget_feature)),
|
| + new BlimpCompositorManager(render_widget_feature, this)),
|
| platform_window_(new ui::X11Window(this)) {
|
| platform_window_->SetBounds(gfx::Rect(window_size));
|
| platform_window_->Show();
|
| @@ -79,5 +78,7 @@ void BlimpDisplayManager::OnAcceleratedWidgetDestroyed() {
|
|
|
| void BlimpDisplayManager::OnActivationChanged(bool active) {}
|
|
|
| +void BlimpDisplayManager::OnSwapBuffersCompleted() {}
|
| +
|
| } // namespace client
|
| } // namespace blimp
|
|
|