Revert "Add PolicyManager as plugin"

[apps/agl-service-windowmanager-2017.git] / src / window_manager.hpp

diff --git a/src/window_manager.hpp b/src/window_manager.hpp
index b5b1c4d..0fb1805 100644 (file)
--- a/src/window_manager.hpp
+++ b/src/window_manager.hpp
@@ -14,10 +14,9 @@
  * limitations under the License.
  */
 
-#ifndef TMCAGLWM_APP_HPP
-#define TMCAGLWM_APP_HPP
+#ifndef WINDOW_MANAGER_HPP
+#define WINDOW_MANAGER_HPP
 
-#include <json-c/json.h>
 #include <atomic>
 #include <memory>
 #include <unordered_map>
@@ -30,6 +29,8 @@
 #include "request.hpp"
 #include "wm_error.hpp"
 
+struct json_object;
+
 namespace wl
 {
 struct display;
@@ -165,9 +166,9 @@ class WindowManager
         "inactive",
         "visible",
         "invisible",
-        "syncdraw",
-        "flushdraw",
-        "screen_updated",
+        "syncDraw",
+        "flushDraw",
+        "screenUpdated",
         "error"};
 
     struct controller_hooks chooks;
@@ -265,14 +266,21 @@ class WindowManager
     void stopTimer();
     void processNextRequest();
 
+    int loadOldRoleDb();
+    const char* convertRoleOldToNew(char const *drawing_name);
+
     const char *check_surface_exist(const char *drawing_name);
 
     bool can_split(struct LayoutState const &state, int new_id);
 
   private:
     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;
+
+    static const char* kDefaultOldRoleDb;
 };
 
 } // namespace wm
 
-#endif // TMCAGLWM_APP_HPP
+#endif // WINDOW_MANAGER_HPP