X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fwindow_manager.hpp;h=759135793108a80cb0c1d208c89007b679d9f6c4;hb=4ba2fdbfb065c971f4a0b9b1dbab8957e7fba38d;hp=d77d23a0783731ffa1e8faae1bbe7f2237ba9936;hpb=27e4f2d7810666d86bcb525d0e7e513e70c5f021;p=apps%2Fagl-service-windowmanager.git

diff --git a/src/window_manager.hpp b/src/window_manager.hpp
index d77d23a..7591357 100644
--- a/src/window_manager.hpp
+++ b/src/window_manager.hpp
@@ -26,10 +26,14 @@
 #include "layout.hpp"
 #include "wayland_ivi_wm.hpp"
 #include "pm_wrapper.hpp"
-#include "hmi-debug.h"
+#include "util.hpp"
 #include "request.hpp"
 #include "wm_error.hpp"
-#include "layout_manager.hpp"
+#include "wm_layer_control.hpp"
+extern "C"
+{
+#include <afb/afb-binding.h>
+}
 
 struct json_object;
 
@@ -89,7 +93,7 @@ struct id_allocator
         unsigned sid = this->next++;
         this->id2name[sid] = name;
         this->name2id[name] = sid;
-        HMI_DEBUG("wm", "allocated new id %u with name %s", sid, name.c_str());
+        HMI_DEBUG("allocated new id %u with name %s", sid, name.c_str());
         return sid;
     }
 
@@ -98,7 +102,7 @@ struct id_allocator
     {
         this->id2name[sid] = name;
         this->name2id[name] = sid;
-        HMI_DEBUG("wm", "register id %u with name %s", sid, name.c_str());
+        HMI_DEBUG("register id %u with name %s", sid, name.c_str());
         return;
     }
 
@@ -281,7 +285,7 @@ class WindowManager
     std::unordered_map<std::string, struct compositor::rect> area2size;
     std::unordered_map<std::string, std::string> roleold2new;
     std::unordered_map<std::string, std::string> rolenew2old;
-    std::shared_ptr<LayoutManager> lm;
+    std::shared_ptr<LayerControl> lm;
     PMWrapper pmw;
 
     static const char* kDefaultOldRoleDb;