From 14fb7290ab56127c196f15df550b51ede2285038 Mon Sep 17 00:00:00 2001
From: Simon Fels <morphis@gravedo.de>
Date: Fri, 17 Mar 2017 07:24:06 +0100
Subject: [PATCH] Fix compile errors after rebase

---
 src/anbox/cmds/session_manager.cpp     | 4 ++--
 src/anbox/wm/multi_window_manager.cpp  | 1 +
 src/anbox/wm/single_window_manager.cpp | 2 +-
 src/anbox/wm/single_window_manager.h   | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/anbox/cmds/session_manager.cpp b/src/anbox/cmds/session_manager.cpp
index 888113d..5c294d0 100644
--- a/src/anbox/cmds/session_manager.cpp
+++ b/src/anbox/cmds/session_manager.cpp
@@ -166,9 +166,9 @@ anbox::cmds::SessionManager::SessionManager(const BusFactory &bus_factory)
 
     std::shared_ptr<wm::Manager> window_manager;
     if (single_window_)
-      window_manager = std::make_shared<wm::SingleWindowManager>(policy, display_frame, app_mgr);
+      window_manager = std::make_shared<wm::SingleWindowManager>(policy, display_frame, app_db);
     else
-      window_manager = std::make_shared<wm::MultiWindowManager>(policy, android_api_stub, app_mgr);
+      window_manager = std::make_shared<wm::MultiWindowManager>(policy, android_api_stub, app_db);
 
     auto gl_server = std::make_shared<graphics::GLRendererServer>(
           graphics::GLRendererServer::Config{gles_driver_, single_window_}, window_manager);
diff --git a/src/anbox/wm/multi_window_manager.cpp b/src/anbox/wm/multi_window_manager.cpp
index 0b45ad5..83ab0b6 100644
--- a/src/anbox/wm/multi_window_manager.cpp
+++ b/src/anbox/wm/multi_window_manager.cpp
@@ -15,6 +15,7 @@
  *
  */
 
+#include "anbox/application/database.h"
 #include "anbox/wm/multi_window_manager.h"
 #include "anbox/platform/policy.h"
 #include "anbox/bridge/android_api_stub.h"
diff --git a/src/anbox/wm/single_window_manager.cpp b/src/anbox/wm/single_window_manager.cpp
index 40c55c4..6adb43e 100644
--- a/src/anbox/wm/single_window_manager.cpp
+++ b/src/anbox/wm/single_window_manager.cpp
@@ -27,7 +27,7 @@
 namespace anbox {
 namespace wm {
 SingleWindowManager::SingleWindowManager(const std::shared_ptr<platform::Policy> &policy,
-                                         const graphics::Rect &window_size
+                                         const graphics::Rect &window_size,
                                          const std::shared_ptr<application::Database> &app_db)
     : platform_policy_(policy), window_size_(window_size), app_db_(app_db) {}
 
diff --git a/src/anbox/wm/single_window_manager.h b/src/anbox/wm/single_window_manager.h
index edb3d00..6d0d2ca 100644
--- a/src/anbox/wm/single_window_manager.h
+++ b/src/anbox/wm/single_window_manager.h
@@ -36,7 +36,7 @@ class Window;
 class SingleWindowManager : public Manager {
  public:
   SingleWindowManager(const std::shared_ptr<platform::Policy> &policy,
-                      const graphics::Rect &window_size
+                      const graphics::Rect &window_size,
                       const std::shared_ptr<application::Database> &app_db);
   ~SingleWindowManager();