Fix compile errors after rebase

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);

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"

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) {}
 

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();