Add Window::SetLayout method
[platform/core/uifw/dali-adaptor.git] / dali / internal / window-system / tizen-wayland / ecore-wl / window-base-ecore-wl.cpp
index e4b610d..fb8bf7f 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
 #include <dali/internal/window-system/tizen-wayland/ecore-wl/window-base-ecore-wl.h>
 
 // INTERNAL HEADERS
+#include <dali/internal/input/common/key-impl.h>
 #include <dali/internal/window-system/common/window-impl.h>
-#include <dali/internal/window-system/common/window-system.h>
 #include <dali/internal/window-system/common/window-render-surface.h>
-#include <dali/internal/input/common/key-impl.h>
 
 // EXTERNAL_HEADERS
-#include <dali/public-api/object/any.h>
-#include <dali/integration-api/debug.h>
 #include <Ecore_Input.h>
-#include <vconf.h>
+#include <dali/integration-api/debug.h>
+#include <dali/public-api/object/any.h>
+
+#if defined(VCONF_ENABLED)
 #include <vconf-keys.h>
+#include <vconf.h>
+#endif
 
 namespace Dali
 {
-
 namespace Internal
 {
-
 namespace Adaptor
 {
-
 namespace
 {
-
 #if defined(DEBUG_ENABLED)
-Debug::Filter* gWindowBaseLogFilter = Debug::Filter::New( Debug::NoLogging, false, "LOG_WINDOW_BASE" );
+Debug::Filter* gWindowBaseLogFilter = Debug::Filter::New(Debug::NoLogging, false, "LOG_WINDOW_BASE");
 #endif
 
-const uint32_t MAX_TIZEN_CLIENT_VERSION = 7;
-const unsigned int PRIMARY_TOUCH_BUTTON_ID = 1;
+const uint32_t     MAX_TIZEN_CLIENT_VERSION = 7;
+const unsigned int PRIMARY_TOUCH_BUTTON_ID  = 1;
 
-const char* DALI_VCONFKEY_SETAPPL_ACCESSIBILITY_FONT_NAME = "db/setting/accessibility/font_name";  // It will be update at vconf-key.h and replaced.
+#if defined(VCONF_ENABLED)
+const char* DALI_VCONFKEY_SETAPPL_ACCESSIBILITY_FONT_NAME = "db/setting/accessibility/font_name"; // It will be update at vconf-key.h and replaced.
+#endif
 
 // DBUS accessibility
-const char* BUS = "org.enlightenment.wm-screen-reader";
+const char* BUS       = "org.enlightenment.wm-screen-reader";
 const char* INTERFACE = "org.tizen.GestureNavigation";
-const char* PATH = "/org/tizen/GestureNavigation";
+const char* PATH      = "/org/tizen/GestureNavigation";
 
 /**
  * Get the device name from the provided ecore key event
  */
-void GetDeviceName( Ecore_Event_Key* keyEvent, std::string& result )
+void GetDeviceName(Ecore_Event_Key* keyEvent, std::string& result)
 {
-  const char* ecoreDeviceName = ecore_device_name_get( keyEvent->dev );
+  const char* ecoreDeviceName = ecore_device_name_get(keyEvent->dev);
 
-  if( ecoreDeviceName )
+  if(ecoreDeviceName)
   {
     result = ecoreDeviceName;
   }
@@ -77,9 +77,9 @@ void GetDeviceName( Ecore_Event_Key* keyEvent, std::string& result )
 /**
  * Get the device class from the provided ecore event
  */
-void GetDeviceClass( Ecore_Device_Class ecoreDeviceClass, Device::Class::Type& deviceClass )
+void GetDeviceClass(Ecore_Device_Class ecoreDeviceClass, Device::Class::Type& deviceClass)
 {
-  switch( ecoreDeviceClass )
+  switch(ecoreDeviceClass)
   {
     case ECORE_DEVICE_CLASS_SEAT:
     {
@@ -124,9 +124,9 @@ void GetDeviceClass( Ecore_Device_Class ecoreDeviceClass, Device::Class::Type& d
   }
 }
 
-void GetDeviceSubclass( Ecore_Device_Subclass ecoreDeviceSubclass, Device::Subclass::Type& deviceSubclass )
+void GetDeviceSubclass(Ecore_Device_Subclass ecoreDeviceSubclass, Device::Subclass::Type& deviceSubclass)
 {
-  switch( ecoreDeviceSubclass )
+  switch(ecoreDeviceSubclass)
   {
     case ECORE_DEVICE_SUBCLASS_FINGER:
     {
@@ -201,60 +201,60 @@ void GetDeviceSubclass( Ecore_Device_Subclass ecoreDeviceSubclass, Device::Subcl
 /////////////////////////////////////////////////////////////////////////////////////////////////
 
 /// Called when the window iconify state is changed.
-static Eina_Bool EcoreEventWindowIconifyStateChanged( void* data, int type, void* event )
+static Eina_Bool EcoreEventWindowIconifyStateChanged(void* data, int type, void* event)
 {
-  WindowBaseEcoreWl* windowBase = static_cast< WindowBaseEcoreWl* >( data );
-  if( windowBase )
+  WindowBaseEcoreWl* windowBase = static_cast<WindowBaseEcoreWl*>(data);
+  if(windowBase)
   {
-    return windowBase->OnIconifyStateChanged( data, type, event );
+    return windowBase->OnIconifyStateChanged(data, type, event);
   }
 
   return ECORE_CALLBACK_PASS_ON;
 }
 
 /// Called when the window gains focus
-static Eina_Bool EcoreEventWindowFocusIn( void* data, int type, void* event )
+static Eina_Bool EcoreEventWindowFocusIn(void* data, int type, void* event)
 {
-  WindowBaseEcoreWl* windowBase = static_cast< WindowBaseEcoreWl* >( data );
-  if( windowBase )
+  WindowBaseEcoreWl* windowBase = static_cast<WindowBaseEcoreWl*>(data);
+  if(windowBase)
   {
-    return windowBase->OnFocusIn( data, type, event );
+    return windowBase->OnFocusIn(data, type, event);
   }
 
   return ECORE_CALLBACK_PASS_ON;
 }
 
 /// Called when the window loses focus
-static Eina_Bool EcoreEventWindowFocusOut( void* data, int type, void* event )
+static Eina_Bool EcoreEventWindowFocusOut(void* data, int type, void* event)
 {
-  WindowBaseEcoreWl* windowBase = static_cast< WindowBaseEcoreWl* >( data );
-  if( windowBase )
+  WindowBaseEcoreWl* windowBase = static_cast<WindowBaseEcoreWl*>(data);
+  if(windowBase)
   {
-    return windowBase->OnFocusOut( data, type, event );
+    return windowBase->OnFocusOut(data, type, event);
   }
 
   return ECORE_CALLBACK_PASS_ON;
 }
 
 /// Called when the output is transformed
-static Eina_Bool EcoreEventOutputTransform( void* data, int type, void* event )
+static Eina_Bool EcoreEventOutputTransform(void* data, int type, void* event)
 {
-  WindowBaseEcoreWl* windowBase = static_cast< WindowBaseEcoreWl* >( data );
-  if( windowBase )
+  WindowBaseEcoreWl* windowBase = static_cast<WindowBaseEcoreWl*>(data);
+  if(windowBase)
   {
-    return windowBase->OnOutputTransform( data, type, event );
+    return windowBase->OnOutputTransform(data, type, event);
   }
 
   return ECORE_CALLBACK_PASS_ON;
 }
 
 /// Called when the output transform should be ignored
-static Eina_Bool EcoreEventIgnoreOutputTransform( void* data, int type, void* event )
+static Eina_Bool EcoreEventIgnoreOutputTransform(void* data, int type, void* event)
 {
-  WindowBaseEcoreWl* windowBase = static_cast< WindowBaseEcoreWl* >( data );
-  if( windowBase )
+  WindowBaseEcoreWl* windowBase = static_cast<WindowBaseEcoreWl*>(data);
+  if(windowBase)
   {
-    return windowBase->OnIgnoreOutputTransform( data, type, event );
+    return windowBase->OnIgnoreOutputTransform(data, type, event);
   }
 
   return ECORE_CALLBACK_PASS_ON;
@@ -263,13 +263,13 @@ static Eina_Bool EcoreEventIgnoreOutputTransform( void* data, int type, void* ev
 /**
  * Called when rotate event is recevied.
  */
-static Eina_Bool EcoreEventRotate( void* data, int type, void* event )
+static Eina_Bool EcoreEventRotate(void* data, int type, void* event)
 {
-  WindowBaseEcoreWl* windowBase = static_cast< WindowBaseEcoreWl* >( data );
-  if( windowBase )
+  WindowBaseEcoreWl* windowBase = static_cast<WindowBaseEcoreWl*>(data);
+  if(windowBase)
   {
-    DALI_LOG_RELEASE_INFO( "WindowBaseEcoreWl::EcoreEventRotate\n" );
-    windowBase->OnRotation( data, type, event );
+    DALI_LOG_RELEASE_INFO("WindowBaseEcoreWl::EcoreEventRotate\n");
+    windowBase->OnRotation(data, type, event);
   }
   return ECORE_CALLBACK_PASS_ON;
 }
@@ -281,12 +281,12 @@ static Eina_Bool EcoreEventRotate( void* data, int type, void* event )
 /**
  * Called when a touch down is received.
  */
-static Eina_Bool EcoreEventMouseButtonDown( void* data, int type, void* event )
+static Eina_Bool EcoreEventMouseButtonDown(void* data, int type, void* event)
 {
-  WindowBaseEcoreWl* windowBase = static_cast< WindowBaseEcoreWl* >( data );
-  if( windowBase )
+  WindowBaseEcoreWl* windowBase = static_cast<WindowBaseEcoreWl*>(data);
+  if(windowBase)
   {
-    windowBase->OnMouseButtonDown( data, type, event );
+    windowBase->OnMouseButtonDown(data, type, event);
   }
   return ECORE_CALLBACK_PASS_ON;
 }
@@ -294,12 +294,12 @@ static Eina_Bool EcoreEventMouseButtonDown( void* data, int type, void* event )
 /**
  * Called when a touch up is received.
  */
-static Eina_Bool EcoreEventMouseButtonUp( void* data, int type, void* event )
+static Eina_Bool EcoreEventMouseButtonUp(void* data, int type, void* event)
 {
-  WindowBaseEcoreWl* windowBase = static_cast< WindowBaseEcoreWl* >( data );
-  if( windowBase )
+  WindowBaseEcoreWl* windowBase = static_cast<WindowBaseEcoreWl*>(data);
+  if(windowBase)
   {
-    windowBase->OnMouseButtonUp( data, type, event );
+    windowBase->OnMouseButtonUp(data, type, event);
   }
   return ECORE_CALLBACK_PASS_ON;
 }
@@ -307,12 +307,12 @@ static Eina_Bool EcoreEventMouseButtonUp( void* data, int type, void* event )
 /**
  * Called when a touch motion is received.
  */
-static Eina_Bool EcoreEventMouseButtonMove( void* data, int type, void* event )
+static Eina_Bool EcoreEventMouseButtonMove(void* data, int type, void* event)
 {
-  WindowBaseEcoreWl* windowBase = static_cast< WindowBaseEcoreWl* >( data );
-  if( windowBase )
+  WindowBaseEcoreWl* windowBase = static_cast<WindowBaseEcoreWl*>(data);
+  if(windowBase)
   {
-    windowBase->OnMouseButtonMove( data, type, event );
+    windowBase->OnMouseButtonMove(data, type, event);
   }
   return ECORE_CALLBACK_PASS_ON;
 }
@@ -320,12 +320,12 @@ static Eina_Bool EcoreEventMouseButtonMove( void* data, int type, void* event )
 /**
  * Called when a touch is canceled.
  */
-static Eina_Bool EcoreEventMouseButtonCancel( void* data, int type, void* event )
+static Eina_Bool EcoreEventMouseButtonCancel(void* data, int type, void* event)
 {
-  WindowBaseEcoreWl* windowBase = static_cast< WindowBaseEcoreWl* >( data );
-  if( windowBase )
+  WindowBaseEcoreWl* windowBase = static_cast<WindowBaseEcoreWl*>(data);
+  if(windowBase)
   {
-    windowBase->OnMouseButtonCancel( data, type, event );
+    windowBase->OnMouseButtonCancel(data, type, event);
   }
   return ECORE_CALLBACK_PASS_ON;
 }
@@ -333,12 +333,12 @@ static Eina_Bool EcoreEventMouseButtonCancel( void* data, int type, void* event
 /**
  * Called when a mouse wheel is received.
  */
-static Eina_Bool EcoreEventMouseWheel( void* data, int type, void* event )
+static Eina_Bool EcoreEventMouseWheel(void* data, int type, void* event)
 {
-  WindowBaseEcoreWl* windowBase = static_cast< WindowBaseEcoreWl* >( data );
-  if( windowBase )
+  WindowBaseEcoreWl* windowBase = static_cast<WindowBaseEcoreWl*>(data);
+  if(windowBase)
   {
-    windowBase->OnMouseWheel( data, type, event );
+    windowBase->OnMouseWheel(data, type, event);
   }
   return ECORE_CALLBACK_PASS_ON;
 }
@@ -346,12 +346,12 @@ static Eina_Bool EcoreEventMouseWheel( void* data, int type, void* event )
 /**
  * Called when a detent rotation event is recevied.
  */
-static Eina_Bool EcoreEventDetentRotation( void* data, int type, void* event )
+static Eina_Bool EcoreEventDetentRotation(void* data, int type, void* event)
 {
-  WindowBaseEcoreWl* windowBase = static_cast< WindowBaseEcoreWl* >( data );
-  if( windowBase )
+  WindowBaseEcoreWl* windowBase = static_cast<WindowBaseEcoreWl*>(data);
+  if(windowBase)
   {
-    windowBase->OnDetentRotation( data, type, event );
+    windowBase->OnDetentRotation(data, type, event);
   }
   return ECORE_CALLBACK_PASS_ON;
 }
@@ -363,12 +363,12 @@ static Eina_Bool EcoreEventDetentRotation( void* data, int type, void* event )
 /**
  * Called when a key down is received.
  */
-static Eina_Bool EcoreEventKeyDown( void* data, int type, void* event )
+static Eina_Bool EcoreEventKeyDown(void* data, int type, void* event)
 {
-  WindowBaseEcoreWl* windowBase = static_cast< WindowBaseEcoreWl* >( data );
-  if( windowBase )
+  WindowBaseEcoreWl* windowBase = static_cast<WindowBaseEcoreWl*>(data);
+  if(windowBase)
   {
-    windowBase->OnKeyDown( data, type, event );
+    windowBase->OnKeyDown(data, type, event);
   }
   return ECORE_CALLBACK_PASS_ON;
 }
@@ -376,12 +376,12 @@ static Eina_Bool EcoreEventKeyDown( void* data, int type, void* event )
 /**
  * Called when a key up is received.
  */
-static Eina_Bool EcoreEventKeyUp( void* data, int type, void* event )
+static Eina_Bool EcoreEventKeyUp(void* data, int type, void* event)
 {
-  WindowBaseEcoreWl* windowBase = static_cast< WindowBaseEcoreWl* >( data );
-  if( windowBase )
+  WindowBaseEcoreWl* windowBase = static_cast<WindowBaseEcoreWl*>(data);
+  if(windowBase)
   {
-    windowBase->OnKeyUp( data, type, event );
+    windowBase->OnKeyUp(data, type, event);
   }
   return ECORE_CALLBACK_PASS_ON;
 }
@@ -393,12 +393,12 @@ static Eina_Bool EcoreEventKeyUp( void* data, int type, void* event )
 /**
  * Called when the source window notifies us the content in clipboard is selected.
  */
-static Eina_Bool EcoreEventDataSend( void* data, int type, void* event )
+static Eina_Bool EcoreEventDataSend(void* data, int type, void* event)
 {
-  WindowBaseEcoreWl* windowBase = static_cast< WindowBaseEcoreWl* >( data );
-  if( windowBase )
+  WindowBaseEcoreWl* windowBase = static_cast<WindowBaseEcoreWl*>(data);
+  if(windowBase)
   {
-    windowBase->OnDataSend( data, type, event );
+    windowBase->OnDataSend(data, type, event);
   }
   return ECORE_CALLBACK_PASS_ON;
 }
@@ -407,12 +407,12 @@ static Eina_Bool EcoreEventDataSend( void* data, int type, void* event )
 * Called when the source window sends us about the selected content.
 * For example, when item is selected in the clipboard.
 */
-static Eina_Bool EcoreEventDataReceive( void* data, int type, void* event )
+static Eina_Bool EcoreEventDataReceive(void* data, int type, void* event)
 {
-  WindowBaseEcoreWl* windowBase = static_cast< WindowBaseEcoreWl* >( data );
-  if( windowBase )
+  WindowBaseEcoreWl* windowBase = static_cast<WindowBaseEcoreWl*>(data);
+  if(windowBase)
   {
-    windowBase->OnDataReceive( data, type, event );
+    windowBase->OnDataReceive(data, type, event);
   }
   return ECORE_CALLBACK_PASS_ON;
 }
@@ -421,13 +421,14 @@ static Eina_Bool EcoreEventDataReceive( void* data, int type, void* event )
 // Font Callbacks
 /////////////////////////////////////////////////////////////////////////////////////////////////
 
+#if defined(VCONF_ENABLED)
 /**
  * Called when a font name is changed.
  */
-static void VconfNotifyFontNameChanged( keynode_t* node, void* data )
+static void VconfNotifyFontNameChanged(keynode_t* node, void* data)
 {
-  WindowBaseEcoreWl* windowBase = static_cast< WindowBaseEcoreWl* >( data );
-  if( windowBase )
+  WindowBaseEcoreWl* windowBase = static_cast<WindowBaseEcoreWl*>(data);
+  if(windowBase)
   {
     windowBase->OnFontNameChanged();
   }
@@ -436,311 +437,283 @@ static void VconfNotifyFontNameChanged( keynode_t* node, void* data )
 /**
  * Called when a font size is changed.
  */
-static void VconfNotifyFontSizeChanged( keynode_t* node, void* data )
+static void VconfNotifyFontSizeChanged(keynode_t* node, void* data)
 {
-  WindowBaseEcoreWl* windowBase = static_cast< WindowBaseEcoreWl* >( data );
-  if( windowBase )
+  WindowBaseEcoreWl* windowBase = static_cast<WindowBaseEcoreWl*>(data);
+  if(windowBase)
   {
     windowBase->OnFontSizeChanged();
   }
 }
+#endif
 
-/////////////////////////////////////////////////////////////////////////////////////////////////
-// ElDBus Accessibility Callbacks
-/////////////////////////////////////////////////////////////////////////////////////////////////
-
-#ifdef DALI_ELDBUS_AVAILABLE
-// Callback for Ecore ElDBus accessibility events.
-static void EcoreElDBusAccessibilityNotification( void* context, const Eldbus_Message* message )
-{
-  WindowBaseEcoreWl* windowBase = static_cast< WindowBaseEcoreWl* >( context );
-  if( windowBase )
-  {
-    windowBase->OnEcoreElDBusAccessibilityNotification( context, message );
-  }
-}
-#endif // DALI_ELDBUS_AVAILABLE
-
-static void RegistryGlobalCallback( void* data, struct wl_registry *registry, uint32_t name, const char* interface, uint32_t version )
+static void RegistryGlobalCallback(void* data, struct wl_registry* registry, uint32_t name, const char* interface, uint32_t version)
 {
-  WindowBaseEcoreWl* windowBase = static_cast< WindowBaseEcoreWl* >( data );
-  if( windowBase )
+  WindowBaseEcoreWl* windowBase = static_cast<WindowBaseEcoreWl*>(data);
+  if(windowBase)
   {
-    windowBase->RegistryGlobalCallback( data, registry, name, interface, version );
+    windowBase->RegistryGlobalCallback(data, registry, name, interface, version);
   }
 }
 
-static void RegistryGlobalCallbackRemove( void* data, struct wl_registry* registry, uint32_t id )
+static void RegistryGlobalCallbackRemove(void* data, struct wl_registry* registry, uint32_t id)
 {
-  WindowBaseEcoreWl* windowBase = static_cast< WindowBaseEcoreWl* >( data );
-  if( windowBase )
+  WindowBaseEcoreWl* windowBase = static_cast<WindowBaseEcoreWl*>(data);
+  if(windowBase)
   {
-    windowBase->RegistryGlobalCallbackRemove( data, registry, id );
+    windowBase->RegistryGlobalCallbackRemove(data, registry, id);
   }
 }
 
-static void TizenPolicyConformant( void* data, struct tizen_policy* tizenPolicy, struct wl_surface* surface, uint32_t isConformant )
+static void TizenPolicyConformant(void* data, struct tizen_policy* tizenPolicy, struct wl_surface* surface, uint32_t isConformant)
 {
 }
 
-static void TizenPolicyConformantArea( void* data, struct tizen_policy* tizenPolicy, struct wl_surface* surface, uint32_t conformantPart, uint32_t state, int32_t x, int32_t y, int32_t w, int32_t h )
+static void TizenPolicyConformantArea(void* data, struct tizen_policy* tizenPolicy, struct wl_surface* surface, uint32_t conformantPart, uint32_t state, int32_t x, int32_t y, int32_t w, int32_t h)
 {
 }
 
-static void TizenPolicyNotificationChangeDone(void* data, struct tizen_policy* tizenPolicy, struct wl_surface* surface, int32_t level, uint32_t state )
+static void TizenPolicyNotificationChangeDone(void* data, struct tizen_policy* tizenPolicy, struct wl_surface* surface, int32_t level, uint32_t state)
 {
-  WindowBaseEcoreWl* windowBase = static_cast< WindowBaseEcoreWl* >( data );
-  if( windowBase )
+  WindowBaseEcoreWl* windowBase = static_cast<WindowBaseEcoreWl*>(data);
+  if(windowBase)
   {
-    windowBase->TizenPolicyNotificationChangeDone( data, tizenPolicy, surface, level, state );
+    windowBase->TizenPolicyNotificationChangeDone(data, tizenPolicy, surface, level, state);
   }
 }
 
-static void TizenPolicyTransientForDone( void* data, struct tizen_policy* tizenPolicy, uint32_t childId )
+static void TizenPolicyTransientForDone(void* data, struct tizen_policy* tizenPolicy, uint32_t childId)
 {
 }
 
-static void TizenPolicyScreenModeChangeDone( void* data, struct tizen_policy* tizenPolicy, struct wl_surface* surface, uint32_t mode, uint32_t state )
+static void TizenPolicyScreenModeChangeDone(void* data, struct tizen_policy* tizenPolicy, struct wl_surface* surface, uint32_t mode, uint32_t state)
 {
-  WindowBaseEcoreWl* windowBase = static_cast< WindowBaseEcoreWl* >( data );
-  if( windowBase )
+  WindowBaseEcoreWl* windowBase = static_cast<WindowBaseEcoreWl*>(data);
+  if(windowBase)
   {
-    windowBase->TizenPolicyScreenModeChangeDone( data, tizenPolicy, surface, mode, state );
+    windowBase->TizenPolicyScreenModeChangeDone(data, tizenPolicy, surface, mode, state);
   }
 }
 
-static void TizenPolicyIconifyStateChanged( void* data, struct tizen_policy* tizenPolicy, struct wl_surface* surface, uint32_t iconified, uint32_t force )
+static void TizenPolicyIconifyStateChanged(void* data, struct tizen_policy* tizenPolicy, struct wl_surface* surface, uint32_t iconified, uint32_t force)
 {
 }
 
-static void TizenPolicySupportedAuxiliaryHints( void* data, struct tizen_policy* tizenPolicy, struct wl_surface* surface, struct wl_array* hints, uint32_t numNints )
+static void TizenPolicySupportedAuxiliaryHints(void* data, struct tizen_policy* tizenPolicy, struct wl_surface* surface, struct wl_array* hints, uint32_t numNints)
 {
 }
 
-static void TizenPolicyAllowedAuxiliaryHint( void* data, struct tizen_policy* tizenPolicy, struct wl_surface* surface, int id )
+static void TizenPolicyAllowedAuxiliaryHint(void* data, struct tizen_policy* tizenPolicy, struct wl_surface* surface, int id)
 {
 }
 
-static void TizenPolicyAuxiliaryMessage( void* data, struct tizen_policy* tizenPolicy, struct wl_surface* surface, const char* key, const char* val, struct wl_array* options )
+static void TizenPolicyAuxiliaryMessage(void* data, struct tizen_policy* tizenPolicy, struct wl_surface* surface, const char* key, const char* val, struct wl_array* options)
 {
 }
 
-static void TizenPolicyConformantRegion( void* data, struct tizen_policy* tizenPolicy, struct wl_surface* surface, uint32_t conformantPart, uint32_t state, int32_t x, int32_t y, int32_t w, int32_t h, uint32_t serial )
+static void TizenPolicyConformantRegion(void* data, struct tizen_policy* tizenPolicy, struct wl_surface* surface, uint32_t conformantPart, uint32_t state, int32_t x, int32_t y, int32_t w, int32_t h, uint32_t serial)
 {
 }
 
-static void DisplayPolicyBrightnessChangeDone( void* data, struct tizen_display_policy *displayPolicy, struct wl_surface* surface, int32_t brightness, uint32_t state )
+static void DisplayPolicyBrightnessChangeDone(void* data, struct tizen_display_policy* displayPolicy, struct wl_surface* surface, int32_t brightness, uint32_t state)
 {
-  WindowBaseEcoreWl* windowBase = static_cast< WindowBaseEcoreWl* >( data );
-  if( windowBase )
+  WindowBaseEcoreWl* windowBase = static_cast<WindowBaseEcoreWl*>(data);
+  if(windowBase)
   {
-    windowBase->DisplayPolicyBrightnessChangeDone( data, displayPolicy, surface, brightness, state );
+    windowBase->DisplayPolicyBrightnessChangeDone(data, displayPolicy, surface, brightness, state);
   }
 }
 
 const struct wl_registry_listener registryListener =
-{
-   RegistryGlobalCallback,
-   RegistryGlobalCallbackRemove
-};
+  {
+    RegistryGlobalCallback,
+    RegistryGlobalCallbackRemove};
 
 const struct tizen_policy_listener tizenPolicyListener =
-{
-   TizenPolicyConformant,
-   TizenPolicyConformantArea,
-   TizenPolicyNotificationChangeDone,
-   TizenPolicyTransientForDone,
-   TizenPolicyScreenModeChangeDone,
-   TizenPolicyIconifyStateChanged,
-   TizenPolicySupportedAuxiliaryHints,
-   TizenPolicyAllowedAuxiliaryHint,
-   TizenPolicyAuxiliaryMessage,
-   TizenPolicyConformantRegion
-};
+  {
+    TizenPolicyConformant,
+    TizenPolicyConformantArea,
+    TizenPolicyNotificationChangeDone,
+    TizenPolicyTransientForDone,
+    TizenPolicyScreenModeChangeDone,
+    TizenPolicyIconifyStateChanged,
+    TizenPolicySupportedAuxiliaryHints,
+    TizenPolicyAllowedAuxiliaryHint,
+    TizenPolicyAuxiliaryMessage,
+    TizenPolicyConformantRegion};
 
 const struct tizen_display_policy_listener tizenDisplayPolicyListener =
-{
-  DisplayPolicyBrightnessChangeDone
-};
+  {
+    DisplayPolicyBrightnessChangeDone};
 
 } // unnamed namespace
 
-WindowBaseEcoreWl::WindowBaseEcoreWl( Dali::PositionSize positionSize, Any surface, bool isTransparent )
+WindowBaseEcoreWl::WindowBaseEcoreWl(Dali::PositionSize positionSize, Any surface, bool isTransparent)
 : mEcoreEventHandler(),
-  mEcoreWindow( NULL ),
-  mWlSurface( NULL ),
-  mEglWindow( NULL ),
-  mDisplay( NULL ),
-  mEventQueue( NULL ),
-  mTizenPolicy( NULL ),
-  mTizenDisplayPolicy( NULL ),
+  mEcoreWindow(nullptr),
+  mWlSurface(nullptr),
+  mEglWindow(nullptr),
+  mDisplay(nullptr),
+  mEventQueue(nullptr),
+  mTizenPolicy(nullptr),
+  mTizenDisplayPolicy(nullptr),
   mSupportedAuxiliaryHints(),
   mAuxiliaryHints(),
-  mNotificationLevel( -1 ),
-  mNotificationChangeState( 0 ),
-  mNotificationLevelChangeDone( true ),
-  mScreenOffMode( 0 ),
-  mScreenOffModeChangeState( 0 ),
-  mScreenOffModeChangeDone( true ),
-  mBrightness( 0 ),
-  mBrightnessChangeState( 0 ),
-  mBrightnessChangeDone( true ),
-  mOwnSurface( false )
-#ifdef DALI_ELDBUS_AVAILABLE
-  , mSystemConnection( NULL )
-#endif
-{
-  Initialize( positionSize, surface, isTransparent );
+  mNotificationLevel(-1),
+  mNotificationChangeState(0),
+  mNotificationLevelChangeDone(true),
+  mScreenOffMode(0),
+  mScreenOffModeChangeState(0),
+  mScreenOffModeChangeDone(true),
+  mBrightness(0),
+  mBrightnessChangeState(0),
+  mBrightnessChangeDone(true),
+  mOwnSurface(false),
+  mWindowRotationAngle(0),
+  mScreenRotationAngle(0),
+  mSupportedPreProtation(0)
+{
+  Initialize(positionSize, surface, isTransparent);
 }
 
 WindowBaseEcoreWl::~WindowBaseEcoreWl()
 {
-#ifdef DALI_ELDBUS_AVAILABLE
-    // Close down ElDBus connections.
-    if( mSystemConnection )
-    {
-      eldbus_connection_unref( mSystemConnection );
-    }
-#endif // DALI_ELDBUS_AVAILABLE
-
-  vconf_ignore_key_changed( VCONFKEY_SETAPPL_ACCESSIBILITY_FONT_SIZE, VconfNotifyFontSizeChanged );
-  vconf_ignore_key_changed( DALI_VCONFKEY_SETAPPL_ACCESSIBILITY_FONT_NAME, VconfNotifyFontNameChanged );
+#if defined(VCONF_ENABLED)
+  vconf_ignore_key_changed(VCONFKEY_SETAPPL_ACCESSIBILITY_FONT_SIZE, VconfNotifyFontSizeChanged);
+  vconf_ignore_key_changed(DALI_VCONFKEY_SETAPPL_ACCESSIBILITY_FONT_NAME, VconfNotifyFontNameChanged);
+#endif
 
-  for( Dali::Vector< Ecore_Event_Handler* >::Iterator iter = mEcoreEventHandler.Begin(), endIter = mEcoreEventHandler.End(); iter != endIter; ++iter )
+  for(Dali::Vector<Ecore_Event_Handler*>::Iterator iter = mEcoreEventHandler.Begin(), endIter = mEcoreEventHandler.End(); iter != endIter; ++iter)
   {
-    ecore_event_handler_del( *iter );
+    ecore_event_handler_del(*iter);
   }
   mEcoreEventHandler.Clear();
 
-  if( mEventQueue )
+  if(mEventQueue)
   {
-    wl_event_queue_destroy( mEventQueue );
+    wl_event_queue_destroy(mEventQueue);
   }
 
   mSupportedAuxiliaryHints.clear();
   mAuxiliaryHints.clear();
 
-  if( mEglWindow != NULL )
+  if(mEglWindow != NULL)
   {
-    wl_egl_window_destroy( mEglWindow );
+    wl_egl_window_destroy(mEglWindow);
     mEglWindow = NULL;
   }
 
-  if( mOwnSurface )
+  if(mOwnSurface)
   {
-    ecore_wl_window_free( mEcoreWindow );
-
-    WindowSystem::Shutdown();
+    ecore_wl_window_free(mEcoreWindow);
   }
 }
 
-void WindowBaseEcoreWl::Initialize( PositionSize positionSize, Any surface, bool isTransparent )
+void WindowBaseEcoreWl::Initialize(PositionSize positionSize, Any surface, bool isTransparent)
 {
-  if( surface.Empty() == false )
+  if(surface.Empty() == false)
   {
     // check we have a valid type
-    DALI_ASSERT_ALWAYS( ( surface.GetType() == typeid (Ecore_Wl_Window *) ) && "Surface type is invalid" );
+    DALI_ASSERT_ALWAYS((surface.GetType() == typeid(Ecore_Wl_Window*)) && "Surface type is invalid");
 
-    mEcoreWindow = AnyCast< Ecore_Wl_Window* >( surface );
+    mEcoreWindow = AnyCast<Ecore_Wl_Window*>(surface);
   }
   else
   {
     // we own the surface about to created
-    WindowSystem::Initialize();
-
     mOwnSurface = true;
-    CreateWindow( positionSize );
+    CreateWindow(positionSize);
   }
 
-  mWlSurface = ecore_wl_window_surface_create( mEcoreWindow );
+  mWlSurface = ecore_wl_window_surface_create(mEcoreWindow);
 
-  SetTransparency( isTransparent );
+  SetTransparency(isTransparent);
 
-  mEcoreEventHandler.PushBack( ecore_event_handler_add( ECORE_WL_EVENT_WINDOW_ICONIFY_STATE_CHANGE, EcoreEventWindowIconifyStateChanged, this ) );
-  mEcoreEventHandler.PushBack( ecore_event_handler_add( ECORE_WL_EVENT_FOCUS_IN,                    EcoreEventWindowFocusIn,             this ) );
-  mEcoreEventHandler.PushBack( ecore_event_handler_add( ECORE_WL_EVENT_FOCUS_OUT,                   EcoreEventWindowFocusOut,            this ) );
-  mEcoreEventHandler.PushBack( ecore_event_handler_add( ECORE_WL_EVENT_OUTPUT_TRANSFORM,            EcoreEventOutputTransform,           this ) );
-  mEcoreEventHandler.PushBack( ecore_event_handler_add( ECORE_WL_EVENT_IGNORE_OUTPUT_TRANSFORM,     EcoreEventIgnoreOutputTransform,     this ) );
+  mEcoreEventHandler.PushBack(ecore_event_handler_add(ECORE_WL_EVENT_WINDOW_ICONIFY_STATE_CHANGE, EcoreEventWindowIconifyStateChanged, this));
+  mEcoreEventHandler.PushBack(ecore_event_handler_add(ECORE_WL_EVENT_FOCUS_IN, EcoreEventWindowFocusIn, this));
+  mEcoreEventHandler.PushBack(ecore_event_handler_add(ECORE_WL_EVENT_FOCUS_OUT, EcoreEventWindowFocusOut, this));
+  mEcoreEventHandler.PushBack(ecore_event_handler_add(ECORE_WL_EVENT_OUTPUT_TRANSFORM, EcoreEventOutputTransform, this));
+  mEcoreEventHandler.PushBack(ecore_event_handler_add(ECORE_WL_EVENT_IGNORE_OUTPUT_TRANSFORM, EcoreEventIgnoreOutputTransform, this));
 
   // Register Rotate event
-  mEcoreEventHandler.PushBack( ecore_event_handler_add( ECORE_WL_EVENT_WINDOW_ROTATE,               EcoreEventRotate,                    this ) );
+  mEcoreEventHandler.PushBack(ecore_event_handler_add(ECORE_WL_EVENT_WINDOW_ROTATE, EcoreEventRotate, this));
 
   // Register Touch events
-  mEcoreEventHandler.PushBack( ecore_event_handler_add( ECORE_EVENT_MOUSE_BUTTON_DOWN,              EcoreEventMouseButtonDown,           this ) );
-  mEcoreEventHandler.PushBack( ecore_event_handler_add( ECORE_EVENT_MOUSE_BUTTON_UP,                EcoreEventMouseButtonUp,             this ) );
-  mEcoreEventHandler.PushBack( ecore_event_handler_add( ECORE_EVENT_MOUSE_MOVE,                     EcoreEventMouseButtonMove,           this ) );
-  mEcoreEventHandler.PushBack( ecore_event_handler_add( ECORE_EVENT_MOUSE_BUTTON_CANCEL,            EcoreEventMouseButtonCancel,         this ) );
+  mEcoreEventHandler.PushBack(ecore_event_handler_add(ECORE_EVENT_MOUSE_BUTTON_DOWN, EcoreEventMouseButtonDown, this));
+  mEcoreEventHandler.PushBack(ecore_event_handler_add(ECORE_EVENT_MOUSE_BUTTON_UP, EcoreEventMouseButtonUp, this));
+  mEcoreEventHandler.PushBack(ecore_event_handler_add(ECORE_EVENT_MOUSE_MOVE, EcoreEventMouseButtonMove, this));
+  mEcoreEventHandler.PushBack(ecore_event_handler_add(ECORE_EVENT_MOUSE_BUTTON_CANCEL, EcoreEventMouseButtonCancel, this));
 
   // Register Mouse wheel events
-  mEcoreEventHandler.PushBack( ecore_event_handler_add( ECORE_EVENT_MOUSE_WHEEL,                    EcoreEventMouseWheel,                this ) );
+  mEcoreEventHandler.PushBack(ecore_event_handler_add(ECORE_EVENT_MOUSE_WHEEL, EcoreEventMouseWheel, this));
 
   // Register Detent event
-  mEcoreEventHandler.PushBack( ecore_event_handler_add( ECORE_EVENT_DETENT_ROTATE,                  EcoreEventDetentRotation,            this ) );
+  mEcoreEventHandler.PushBack(ecore_event_handler_add(ECORE_EVENT_DETENT_ROTATE, EcoreEventDetentRotation, this));
 
   // Register Key events
-  mEcoreEventHandler.PushBack( ecore_event_handler_add( ECORE_EVENT_KEY_DOWN,                       EcoreEventKeyDown,                   this ) );
-  mEcoreEventHandler.PushBack( ecore_event_handler_add( ECORE_EVENT_KEY_UP,                         EcoreEventKeyUp,                     this ) );
+  mEcoreEventHandler.PushBack(ecore_event_handler_add(ECORE_EVENT_KEY_DOWN, EcoreEventKeyDown, this));
+  mEcoreEventHandler.PushBack(ecore_event_handler_add(ECORE_EVENT_KEY_UP, EcoreEventKeyUp, this));
 
   // Register Selection event - clipboard selection
-  mEcoreEventHandler.PushBack( ecore_event_handler_add( ECORE_WL_EVENT_DATA_SOURCE_SEND,            EcoreEventDataSend,                  this ) );
-  mEcoreEventHandler.PushBack( ecore_event_handler_add( ECORE_WL_EVENT_SELECTION_DATA_READY,        EcoreEventDataReceive,               this ) );
+  mEcoreEventHandler.PushBack(ecore_event_handler_add(ECORE_WL_EVENT_DATA_SOURCE_SEND, EcoreEventDataSend, this));
+  mEcoreEventHandler.PushBack(ecore_event_handler_add(ECORE_WL_EVENT_SELECTION_DATA_READY, EcoreEventDataReceive, this));
 
+#if defined(VCONF_ENABLED)
   // Register Vconf notify - font name and size
-  vconf_notify_key_changed( DALI_VCONFKEY_SETAPPL_ACCESSIBILITY_FONT_NAME, VconfNotifyFontNameChanged, this );
-  vconf_notify_key_changed( VCONFKEY_SETAPPL_ACCESSIBILITY_FONT_SIZE, VconfNotifyFontSizeChanged, this );
-
-  InitializeEcoreElDBus();
+  vconf_notify_key_changed_for_ui_thread(DALI_VCONFKEY_SETAPPL_ACCESSIBILITY_FONT_NAME, VconfNotifyFontNameChanged, this);
+  vconf_notify_key_changed_for_ui_thread(VCONFKEY_SETAPPL_ACCESSIBILITY_FONT_SIZE, VconfNotifyFontSizeChanged, this);
+#endif
 
   mDisplay = ecore_wl_display_get();
 
-  if( mDisplay )
+  if(mDisplay)
   {
-    wl_display* displayWrapper = static_cast< wl_display* >( wl_proxy_create_wrapper( mDisplay ) );
-    if( displayWrapper )
+    wl_display* displayWrapper = static_cast<wl_display*>(wl_proxy_create_wrapper(mDisplay));
+    if(displayWrapper)
     {
-      mEventQueue = wl_display_create_queue( mDisplay );
-      if( mEventQueue )
+      mEventQueue = wl_display_create_queue(mDisplay);
+      if(mEventQueue)
       {
-        wl_proxy_set_queue( reinterpret_cast< wl_proxy* >( displayWrapper ), mEventQueue );
+        wl_proxy_set_queue(reinterpret_cast<wl_proxy*>(displayWrapper), mEventQueue);
 
-        wl_registry* registry = wl_display_get_registry( displayWrapper );
-        wl_registry_add_listener( registry, &registryListener, this );
+        wl_registry* registry = wl_display_get_registry(displayWrapper);
+        wl_registry_add_listener(registry, &registryListener, this);
       }
 
-      wl_proxy_wrapper_destroy( displayWrapper );
+      wl_proxy_wrapper_destroy(displayWrapper);
     }
   }
 
   // get auxiliary hint
-  Eina_List* hints = ecore_wl_window_aux_hints_supported_get( mEcoreWindow );
-  if( hints )
+  Eina_List* hints = ecore_wl_window_aux_hints_supported_get(mEcoreWindow);
+  if(hints)
   {
-    Eina_List* l = NULL;
-    char* hint = NULL;
+    Eina_List* l    = NULL;
+    char*      hint = NULL;
 
-    for( l = hints, ( hint =  static_cast< char* >( eina_list_data_get(l) ) ); l; l = eina_list_next(l), ( hint = static_cast< char* >( eina_list_data_get(l) ) ) )
+    for(l = hints, (hint = static_cast<char*>(eina_list_data_get(l))); l; l = eina_list_next(l), (hint = static_cast<char*>(eina_list_data_get(l))))
     {
-      mSupportedAuxiliaryHints.push_back( hint );
+      mSupportedAuxiliaryHints.push_back(hint);
 
-      DALI_LOG_INFO( gWindowBaseLogFilter, Debug::Verbose, "WindowBaseEcoreWl::Initialize: %s\n", hint );
+      DALI_LOG_INFO(gWindowBaseLogFilter, Debug::Verbose, "WindowBaseEcoreWl::Initialize: %s\n", hint);
     }
   }
 }
 
-Eina_Bool WindowBaseEcoreWl::OnIconifyStateChanged( void* data, int type, void* event )
+Eina_Bool WindowBaseEcoreWl::OnIconifyStateChanged(void* data, int type, void* event)
 {
-  Ecore_Wl_Event_Window_Iconify_State_Change* iconifyChangedEvent( static_cast< Ecore_Wl_Event_Window_Iconify_State_Change* >( event ) );
-  Eina_Bool handled( ECORE_CALLBACK_PASS_ON );
+  Ecore_Wl_Event_Window_Iconify_State_Change* iconifyChangedEvent(static_cast<Ecore_Wl_Event_Window_Iconify_State_Change*>(event));
+  Eina_Bool                                   handled(ECORE_CALLBACK_PASS_ON);
 
-  if( iconifyChangedEvent->win == static_cast< unsigned int>( ecore_wl_window_id_get( mEcoreWindow ) ) )
+  if(iconifyChangedEvent->win == static_cast<unsigned int>(ecore_wl_window_id_get(mEcoreWindow)))
   {
-    if( iconifyChangedEvent->iconified == EINA_TRUE )
+    if(iconifyChangedEvent->iconified == EINA_TRUE)
     {
-      mIconifyChangedSignal.Emit( true );
+      mIconifyChangedSignal.Emit(true);
     }
     else
     {
-      mIconifyChangedSignal.Emit( false );
+      mIconifyChangedSignal.Emit(false);
     }
     handled = ECORE_CALLBACK_DONE;
   }
@@ -748,41 +721,41 @@ Eina_Bool WindowBaseEcoreWl::OnIconifyStateChanged( void* data, int type, void*
   return handled;
 }
 
-Eina_Bool WindowBaseEcoreWl::OnFocusIn( void* data, int type, void* event )
+Eina_Bool WindowBaseEcoreWl::OnFocusIn(void* data, int type, void* event)
 {
-  Ecore_Wl_Event_Focus_In* focusInEvent( static_cast< Ecore_Wl_Event_Focus_In* >( event ) );
+  Ecore_Wl_Event_Focus_In* focusInEvent(static_cast<Ecore_Wl_Event_Focus_In*>(event));
 
-  if( focusInEvent->win == static_cast< unsigned int >( ecore_wl_window_id_get( mEcoreWindow ) ) )
+  if(focusInEvent->win == static_cast<unsigned int>(ecore_wl_window_id_get(mEcoreWindow)))
   {
-    DALI_LOG_INFO( gWindowBaseLogFilter, Debug::General, "Window EcoreEventWindowFocusIn\n" );
+    DALI_LOG_INFO(gWindowBaseLogFilter, Debug::General, "Window EcoreEventWindowFocusIn\n");
 
-    mFocusChangedSignal.Emit( true );
+    mFocusChangedSignal.Emit(true);
   }
 
   return ECORE_CALLBACK_PASS_ON;
 }
 
-Eina_Bool WindowBaseEcoreWl::OnFocusOut( void* data, int type, void* event )
+Eina_Bool WindowBaseEcoreWl::OnFocusOut(void* data, int type, void* event)
 {
-  Ecore_Wl_Event_Focus_Out* focusOutEvent( static_cast< Ecore_Wl_Event_Focus_Out* >( event ) );
+  Ecore_Wl_Event_Focus_Out* focusOutEvent(static_cast<Ecore_Wl_Event_Focus_Out*>(event));
 
-  if( focusOutEvent->win == static_cast< unsigned int >( ecore_wl_window_id_get( mEcoreWindow ) ) )
+  if(focusOutEvent->win == static_cast<unsigned int>(ecore_wl_window_id_get(mEcoreWindow)))
   {
-    DALI_LOG_INFO( gWindowBaseLogFilter, Debug::General, "Window EcoreEventWindowFocusOut\n" );
+    DALI_LOG_INFO(gWindowBaseLogFilter, Debug::General, "Window EcoreEventWindowFocusOut\n");
 
-    mFocusChangedSignal.Emit( false );
+    mFocusChangedSignal.Emit(false);
   }
 
   return ECORE_CALLBACK_PASS_ON;
 }
 
-Eina_Bool WindowBaseEcoreWl::OnOutputTransform( void* data, int type, void* event )
+Eina_Bool WindowBaseEcoreWl::OnOutputTransform(void* data, int type, void* event)
 {
-  Ecore_Wl_Event_Output_Transform* transformEvent( static_cast< Ecore_Wl_Event_Output_Transform* >( event ) );
+  Ecore_Wl_Event_Output_Transform* transformEvent(static_cast<Ecore_Wl_Event_Output_Transform*>(event));
 
-  if( transformEvent->output == ecore_wl_window_output_find( mEcoreWindow ) )
+  if(transformEvent->output == ecore_wl_window_output_find(mEcoreWindow))
   {
-    DALI_LOG_INFO( gWindowBaseLogFilter, Debug::General, "Window (%p) EcoreEventOutputTransform\n", mEcoreWindow );
+    DALI_LOG_INFO(gWindowBaseLogFilter, Debug::General, "Window (%p) EcoreEventOutputTransform\n", mEcoreWindow);
 
     mOutputTransformedSignal.Emit();
   }
@@ -790,13 +763,13 @@ Eina_Bool WindowBaseEcoreWl::OnOutputTransform( void* data, int type, void* even
   return ECORE_CALLBACK_PASS_ON;
 }
 
-Eina_Bool WindowBaseEcoreWl::OnIgnoreOutputTransform( void* data, int type, void* event )
+Eina_Bool WindowBaseEcoreWl::OnIgnoreOutputTransform(void* data, int type, void* event)
 {
-  Ecore_Wl_Event_Ignore_Output_Transform* ignoreTransformEvent( static_cast< Ecore_Wl_Event_Ignore_Output_Transform* >( event ) );
+  Ecore_Wl_Event_Ignore_Output_Transform* ignoreTransformEvent(static_cast<Ecore_Wl_Event_Ignore_Output_Transform*>(event));
 
-  if( ignoreTransformEvent->win == mEcoreWindow )
+  if(ignoreTransformEvent->win == mEcoreWindow)
   {
-    DALI_LOG_INFO( gWindowBaseLogFilter, Debug::General, "Window (%p) EcoreEventIgnoreOutputTransform\n", mEcoreWindow );
+    DALI_LOG_INFO(gWindowBaseLogFilter, Debug::General, "Window (%p) EcoreEventIgnoreOutputTransform\n", mEcoreWindow);
 
     mOutputTransformedSignal.Emit();
   }
@@ -804,381 +777,366 @@ Eina_Bool WindowBaseEcoreWl::OnIgnoreOutputTransform( void* data, int type, void
   return ECORE_CALLBACK_PASS_ON;
 }
 
-void WindowBaseEcoreWl::OnRotation( void* data, int type, void* event )
+void WindowBaseEcoreWl::OnRotation(void* data, int type, void* event)
 {
-  Ecore_Wl_Event_Window_Rotate* ev( static_cast< Ecore_Wl_Event_Window_Rotate* >( event ) );
+  Ecore_Wl_Event_Window_Rotate* ev(static_cast<Ecore_Wl_Event_Window_Rotate*>(event));
 
-  if( ev->win == static_cast< unsigned int >( ecore_wl_window_id_get( mEcoreWindow ) ) )
+  if(ev->win == static_cast<unsigned int>(ecore_wl_window_id_get(mEcoreWindow)))
   {
-    DALI_LOG_RELEASE_INFO( "WindowBaseEcoreWl::OnRotation, angle: %d, width: %d, height: %d\n", ev->angle, ev->w, ev->h );
+    DALI_LOG_RELEASE_INFO("WindowBaseEcoreWl::OnRotation, angle: %d, width: %d, height: %d\n", ev->angle, ev->w, ev->h);
 
     RotationEvent rotationEvent;
-    rotationEvent.angle = ev->angle;
+    rotationEvent.angle     = ev->angle;
     rotationEvent.winResize = 0;
 
-    if( ev->angle == 0 || ev->angle == 180 )
+    if(ev->angle == 0 || ev->angle == 180)
     {
-      rotationEvent.width = ev->w;
+      rotationEvent.width  = ev->w;
       rotationEvent.height = ev->h;
     }
     else
     {
-      rotationEvent.width = ev->h;
+      rotationEvent.width  = ev->h;
       rotationEvent.height = ev->w;
     }
 
-    mRotationSignal.Emit( rotationEvent );
+    mRotationSignal.Emit(rotationEvent);
   }
 }
 
-void WindowBaseEcoreWl::OnMouseButtonDown( void* data, int type, void* event )
+void WindowBaseEcoreWl::OnMouseButtonDown(void* data, int type, void* event)
 {
-  Ecore_Event_Mouse_Button* touchEvent = static_cast< Ecore_Event_Mouse_Button* >( event );
+  Ecore_Event_Mouse_Button* touchEvent = static_cast<Ecore_Event_Mouse_Button*>(event);
 
-  if( touchEvent->window == static_cast< unsigned int >( ecore_wl_window_id_get( mEcoreWindow ) ) )
+  if(touchEvent->window == static_cast<unsigned int>(ecore_wl_window_id_get(mEcoreWindow)))
   {
-    PointState::Type state ( PointState::DOWN );
+    PointState::Type state(PointState::DOWN);
 
     // Check if the buttons field is set and ensure it's the primary touch button.
     // If this event was triggered by buttons other than the primary button (used for touch), then
     // just send an interrupted event to Core.
-    if( touchEvent->buttons && (touchEvent->buttons != PRIMARY_TOUCH_BUTTON_ID ) )
+    if(touchEvent->buttons && (touchEvent->buttons != PRIMARY_TOUCH_BUTTON_ID))
     {
       state = PointState::INTERRUPTED;
     }
 
-    Device::Class::Type deviceClass;
+    Device::Class::Type    deviceClass;
     Device::Subclass::Type deviceSubclass;
 
-    GetDeviceClass( ecore_device_class_get( touchEvent->dev ), deviceClass );
-    GetDeviceSubclass( ecore_device_subclass_get( touchEvent->dev ), deviceSubclass );
+    GetDeviceClass(ecore_device_class_get(touchEvent->dev), deviceClass);
+    GetDeviceSubclass(ecore_device_subclass_get(touchEvent->dev), deviceSubclass);
 
     Integration::Point point;
-    point.SetDeviceId( touchEvent->multi.device );
-    point.SetState( state );
-    point.SetScreenPosition( Vector2( touchEvent->x, touchEvent->y ) );
-    point.SetRadius( touchEvent->multi.radius, Vector2( touchEvent->multi.radius_x, touchEvent->multi.radius_y ) );
-    point.SetPressure( touchEvent->multi.pressure );
-    point.SetAngle( Degree( touchEvent->multi.angle ) );
-    point.SetDeviceClass( deviceClass );
-    point.SetDeviceSubclass( deviceSubclass );
+    point.SetDeviceId(touchEvent->multi.device);
+    point.SetState(state);
+    point.SetScreenPosition(Vector2(touchEvent->x, touchEvent->y));
+    point.SetRadius(touchEvent->multi.radius, Vector2(touchEvent->multi.radius_x, touchEvent->multi.radius_y));
+    point.SetPressure(touchEvent->multi.pressure);
+    point.SetAngle(Degree(touchEvent->multi.angle));
+    point.SetDeviceClass(deviceClass);
+    point.SetDeviceSubclass(deviceSubclass);
 
-    mTouchEventSignal.Emit( point, touchEvent->timestamp );
+    mTouchEventSignal.Emit(point, touchEvent->timestamp);
   }
 }
 
-void WindowBaseEcoreWl::OnMouseButtonUp( void* data, int type, void* event )
+void WindowBaseEcoreWl::OnMouseButtonUp(void* data, int type, void* event)
 {
-  Ecore_Event_Mouse_Button* touchEvent = static_cast< Ecore_Event_Mouse_Button* >( event );
+  Ecore_Event_Mouse_Button* touchEvent = static_cast<Ecore_Event_Mouse_Button*>(event);
 
-  if( touchEvent->window == static_cast< unsigned int >( ecore_wl_window_id_get( mEcoreWindow ) ) )
+  if(touchEvent->window == static_cast<unsigned int>(ecore_wl_window_id_get(mEcoreWindow)))
   {
-    Device::Class::Type deviceClass;
+    Device::Class::Type    deviceClass;
     Device::Subclass::Type deviceSubclass;
 
-    GetDeviceClass( ecore_device_class_get( touchEvent->dev ), deviceClass );
-    GetDeviceSubclass( ecore_device_subclass_get( touchEvent->dev ), deviceSubclass );
+    GetDeviceClass(ecore_device_class_get(touchEvent->dev), deviceClass);
+    GetDeviceSubclass(ecore_device_subclass_get(touchEvent->dev), deviceSubclass);
 
     Integration::Point point;
-    point.SetDeviceId( touchEvent->multi.device );
-    point.SetState( PointState::UP );
-    point.SetScreenPosition( Vector2( touchEvent->x, touchEvent->y ) );
-    point.SetRadius( touchEvent->multi.radius, Vector2( touchEvent->multi.radius_x, touchEvent->multi.radius_y ) );
-    point.SetPressure( touchEvent->multi.pressure );
-    point.SetAngle( Degree( touchEvent->multi.angle ) );
-    point.SetDeviceClass( deviceClass );
-    point.SetDeviceSubclass( deviceSubclass );
+    point.SetDeviceId(touchEvent->multi.device);
+    point.SetState(PointState::UP);
+    point.SetScreenPosition(Vector2(touchEvent->x, touchEvent->y));
+    point.SetRadius(touchEvent->multi.radius, Vector2(touchEvent->multi.radius_x, touchEvent->multi.radius_y));
+    point.SetPressure(touchEvent->multi.pressure);
+    point.SetAngle(Degree(touchEvent->multi.angle));
+    point.SetDeviceClass(deviceClass);
+    point.SetDeviceSubclass(deviceSubclass);
 
-    mTouchEventSignal.Emit( point, touchEvent->timestamp );
+    mTouchEventSignal.Emit(point, touchEvent->timestamp);
   }
 }
 
-void WindowBaseEcoreWl::OnMouseButtonMove( void* data, int type, void* event )
+void WindowBaseEcoreWl::OnMouseButtonMove(void* data, int type, void* event)
 {
-  Ecore_Event_Mouse_Move* touchEvent = static_cast< Ecore_Event_Mouse_Move* >( event );
+  Ecore_Event_Mouse_Move* touchEvent = static_cast<Ecore_Event_Mouse_Move*>(event);
 
-  if( touchEvent->window == static_cast< unsigned int >( ecore_wl_window_id_get( mEcoreWindow ) ) )
+  if(touchEvent->window == static_cast<unsigned int>(ecore_wl_window_id_get(mEcoreWindow)))
   {
-    Device::Class::Type deviceClass;
+    Device::Class::Type    deviceClass;
     Device::Subclass::Type deviceSubclass;
 
-    GetDeviceClass( ecore_device_class_get( touchEvent->dev ), deviceClass );
-    GetDeviceSubclass( ecore_device_subclass_get( touchEvent->dev ), deviceSubclass );
+    GetDeviceClass(ecore_device_class_get(touchEvent->dev), deviceClass);
+    GetDeviceSubclass(ecore_device_subclass_get(touchEvent->dev), deviceSubclass);
 
     Integration::Point point;
-    point.SetDeviceId( touchEvent->multi.device );
-    point.SetState( PointState::MOTION );
-    point.SetScreenPosition( Vector2( touchEvent->x, touchEvent->y ) );
-    point.SetRadius( touchEvent->multi.radius, Vector2( touchEvent->multi.radius_x, touchEvent->multi.radius_y ) );
-    point.SetPressure( touchEvent->multi.pressure );
-    point.SetAngle( Degree( touchEvent->multi.angle ) );
-    point.SetDeviceClass( deviceClass );
-    point.SetDeviceSubclass( deviceSubclass );
+    point.SetDeviceId(touchEvent->multi.device);
+    point.SetState(PointState::MOTION);
+    point.SetScreenPosition(Vector2(touchEvent->x, touchEvent->y));
+    point.SetRadius(touchEvent->multi.radius, Vector2(touchEvent->multi.radius_x, touchEvent->multi.radius_y));
+    point.SetPressure(touchEvent->multi.pressure);
+    point.SetAngle(Degree(touchEvent->multi.angle));
+    point.SetDeviceClass(deviceClass);
+    point.SetDeviceSubclass(deviceSubclass);
 
-    mTouchEventSignal.Emit( point, touchEvent->timestamp );
+    mTouchEventSignal.Emit(point, touchEvent->timestamp);
   }
 }
 
-void WindowBaseEcoreWl::OnMouseButtonCancel( void* data, int type, void* event )
+void WindowBaseEcoreWl::OnMouseButtonCancel(void* data, int type, void* event)
 {
-  Ecore_Event_Mouse_Button* touchEvent = static_cast< Ecore_Event_Mouse_Button* >( event );
+  Ecore_Event_Mouse_Button* touchEvent = static_cast<Ecore_Event_Mouse_Button*>(event);
 
-  if( touchEvent->window == static_cast< unsigned int >( ecore_wl_window_id_get( mEcoreWindow ) ) )
+  if(touchEvent->window == static_cast<unsigned int>(ecore_wl_window_id_get(mEcoreWindow)))
   {
     Integration::Point point;
-    point.SetDeviceId( touchEvent->multi.device );
-    point.SetState( PointState::INTERRUPTED );
-    point.SetScreenPosition( Vector2( 0.0f, 0.0f ) );
+    point.SetDeviceId(touchEvent->multi.device);
+    point.SetState(PointState::INTERRUPTED);
+    point.SetScreenPosition(Vector2(0.0f, 0.0f));
 
-    mTouchEventSignal.Emit( point, touchEvent->timestamp );
+    mTouchEventSignal.Emit(point, touchEvent->timestamp);
 
-    DALI_LOG_INFO( gWindowBaseLogFilter, Debug::General, "WindowBaseEcoreWl::OnMouseButtonCancel\n" );
+    DALI_LOG_INFO(gWindowBaseLogFilter, Debug::General, "WindowBaseEcoreWl::OnMouseButtonCancel\n");
   }
 }
 
-void WindowBaseEcoreWl::OnMouseWheel( void* data, int type, void* event )
+void WindowBaseEcoreWl::OnMouseWheel(void* data, int type, void* event)
 {
-  Ecore_Event_Mouse_Wheel* mouseWheelEvent = static_cast< Ecore_Event_Mouse_Wheel* >( event );
+  Ecore_Event_Mouse_Wheel* mouseWheelEvent = static_cast<Ecore_Event_Mouse_Wheel*>(event);
 
-  if( mouseWheelEvent->window == static_cast< unsigned int >( ecore_wl_window_id_get( mEcoreWindow ) ) )
+  if(mouseWheelEvent->window == static_cast<unsigned int>(ecore_wl_window_id_get(mEcoreWindow)))
   {
-    DALI_LOG_INFO( gWindowBaseLogFilter, Debug::General, "WindowBaseEcoreWl::OnMouseWheel: direction: %d, modifiers: %d, x: %d, y: %d, z: %d\n", mouseWheelEvent->direction, mouseWheelEvent->modifiers, mouseWheelEvent->x, mouseWheelEvent->y, mouseWheelEvent->z );
+    DALI_LOG_INFO(gWindowBaseLogFilter, Debug::General, "WindowBaseEcoreWl::OnMouseWheel: direction: %d, modifiers: %d, x: %d, y: %d, z: %d\n", mouseWheelEvent->direction, mouseWheelEvent->modifiers, mouseWheelEvent->x, mouseWheelEvent->y, mouseWheelEvent->z);
 
-    WheelEvent wheelEvent( WheelEvent::MOUSE_WHEEL, mouseWheelEvent->direction, mouseWheelEvent->modifiers, Vector2( mouseWheelEvent->x, mouseWheelEvent->y ), mouseWheelEvent->z, mouseWheelEvent->timestamp );
+    Integration::WheelEvent wheelEvent(Integration::WheelEvent::MOUSE_WHEEL, mouseWheelEvent->direction, mouseWheelEvent->modifiers, Vector2(mouseWheelEvent->x, mouseWheelEvent->y), mouseWheelEvent->z, mouseWheelEvent->timestamp);
 
-    mWheelEventSignal.Emit( wheelEvent );
+    mWheelEventSignal.Emit(wheelEvent);
   }
 }
 
-void WindowBaseEcoreWl::OnDetentRotation( void* data, int type, void* event )
+void WindowBaseEcoreWl::OnDetentRotation(void* data, int type, void* event)
 {
-  Ecore_Event_Detent_Rotate* detentEvent = static_cast< Ecore_Event_Detent_Rotate* >( event );
+  Ecore_Event_Detent_Rotate* detentEvent = static_cast<Ecore_Event_Detent_Rotate*>(event);
 
-  DALI_LOG_INFO( gWindowBaseLogFilter, Debug::Concise, "WindowBaseEcoreWl::OnDetentRotation\n" );
+  DALI_LOG_INFO(gWindowBaseLogFilter, Debug::Concise, "WindowBaseEcoreWl::OnDetentRotation\n");
 
-  int direction = ( detentEvent->direction == ECORE_DETENT_DIRECTION_CLOCKWISE ) ? 1 : -1;
+  int direction = (detentEvent->direction == ECORE_DETENT_DIRECTION_CLOCKWISE) ? 1 : -1;
   int timeStamp = detentEvent->timestamp;
 
-  WheelEvent wheelEvent( WheelEvent::CUSTOM_WHEEL, 0, 0, Vector2( 0.0f, 0.0f ), direction, timeStamp );
+  Integration::WheelEvent wheelEvent(Integration::WheelEvent::CUSTOM_WHEEL, 0, 0, Vector2(0.0f, 0.0f), direction, timeStamp);
 
-  mWheelEventSignal.Emit( wheelEvent );
+  mWheelEventSignal.Emit(wheelEvent);
 }
 
-void WindowBaseEcoreWl::OnKeyDown( void* data, int type, void* event )
+void WindowBaseEcoreWl::OnKeyDown(void* data, int type, void* event)
 {
-  Ecore_Event_Key* keyEvent = static_cast< Ecore_Event_Key* >( event );
+  Ecore_Event_Key* keyEvent = static_cast<Ecore_Event_Key*>(event);
 
-  if( keyEvent->window == static_cast< unsigned int >( ecore_wl_window_id_get( mEcoreWindow ) ) )
+  if(keyEvent->window == static_cast<unsigned int>(ecore_wl_window_id_get(mEcoreWindow)))
   {
-    DALI_LOG_INFO( gWindowBaseLogFilter, Debug::General, "WindowBaseEcoreWl::OnKeyDown\n" );
+    DALI_LOG_INFO(gWindowBaseLogFilter, Debug::General, "WindowBaseEcoreWl::OnKeyDown\n");
 
-    std::string keyName( keyEvent->keyname );
-    std::string logicalKey( "" );
-    std::string keyString( "" );
-    std::string compose( "" );
+    std::string keyName(keyEvent->keyname);
+    std::string logicalKey("");
+    std::string keyString("");
+    std::string compose("");
 
     // Ensure key compose string is not NULL as keys like SHIFT or arrow have a null string.
-    if( keyEvent->compose )
+    if(keyEvent->compose)
     {
       compose = keyEvent->compose;
     }
 
     // Ensure key symbol is not NULL as keys like SHIFT have a null string.
-    if( keyEvent->key )
+    if(keyEvent->key)
     {
       logicalKey = keyEvent->key;
     }
 
-    int keyCode = KeyLookup::GetDaliKeyCode( keyEvent->keyname );
-    keyCode = ( keyCode == -1 ) ? 0 : keyCode;
-    int modifier( keyEvent->modifiers );
+    int keyCode = KeyLookup::GetDaliKeyCode(keyEvent->keyname);
+    keyCode     = (keyCode == -1) ? 0 : keyCode;
+    int           modifier(keyEvent->modifiers);
     unsigned long time = keyEvent->timestamp;
-    if( !strncmp( keyEvent->keyname, "Keycode-", 8 ) )
+    if(!strncmp(keyEvent->keyname, "Keycode-", 8))
     {
-      keyCode = atoi( keyEvent->keyname + 8 );
+      keyCode = atoi(keyEvent->keyname + 8);
     }
 
     // Ensure key event string is not NULL as keys like SHIFT have a null string.
-    if( keyEvent->string )
+    if(keyEvent->string)
     {
       keyString = keyEvent->string;
     }
 
-    std::string deviceName;
-    Device::Class::Type deviceClass;
+    std::string            deviceName;
+    Device::Class::Type    deviceClass;
     Device::Subclass::Type deviceSubclass;
 
-    GetDeviceName( keyEvent, deviceName );
-    GetDeviceClass( ecore_device_class_get( keyEvent->dev ), deviceClass );
-    GetDeviceSubclass( ecore_device_subclass_get( keyEvent->dev ), deviceSubclass );
+    GetDeviceName(keyEvent, deviceName);
+    GetDeviceClass(ecore_device_class_get(keyEvent->dev), deviceClass);
+    GetDeviceSubclass(ecore_device_subclass_get(keyEvent->dev), deviceSubclass);
 
-    Integration::KeyEvent keyEvent( keyName, logicalKey, keyString, keyCode, modifier, time, Integration::KeyEvent::Down, compose, deviceName, deviceClass, deviceSubclass );
+    Integration::KeyEvent keyEvent(keyName, logicalKey, keyString, keyCode, modifier, time, Integration::KeyEvent::DOWN, compose, deviceName, deviceClass, deviceSubclass);
 
-     mKeyEventSignal.Emit( keyEvent );
+    mKeyEventSignal.Emit(keyEvent);
   }
 }
 
-void WindowBaseEcoreWl::OnKeyUp( void* data, int type, void* event )
+void WindowBaseEcoreWl::OnKeyUp(void* data, int type, void* event)
 {
-  Ecore_Event_Key* keyEvent = static_cast< Ecore_Event_Key* >( event );
+  Ecore_Event_Key* keyEvent = static_cast<Ecore_Event_Key*>(event);
 
-  if( keyEvent->window == static_cast< unsigned int >( ecore_wl_window_id_get( mEcoreWindow ) ) )
+  if(keyEvent->window == static_cast<unsigned int>(ecore_wl_window_id_get(mEcoreWindow)))
   {
-    DALI_LOG_INFO( gWindowBaseLogFilter, Debug::General, "WindowBaseEcoreWl::OnKeyUp\n" );
+    DALI_LOG_INFO(gWindowBaseLogFilter, Debug::General, "WindowBaseEcoreWl::OnKeyUp\n");
 
 #if defined(ECORE_VERSION_MAJOR) && (ECORE_VERSION_MAJOR >= 1) && defined(ECORE_VERSION_MINOR) && (ECORE_VERSION_MINOR >= 23)
     // Cancel processing flag is sent because this key event will combine with the previous key. So, the event should not actually perform anything.
-    if( keyEvent->event_flags & ECORE_EVENT_FLAG_CANCEL )
+    if(keyEvent->event_flags & ECORE_EVENT_FLAG_CANCEL)
     {
-      DALI_LOG_INFO( gWindowBaseLogFilter, Debug::General, "WindowBaseEcoreWl::OnKeyUp: This event flag indicates the event is canceled. \n" );
+      DALI_LOG_INFO(gWindowBaseLogFilter, Debug::General, "WindowBaseEcoreWl::OnKeyUp: This event flag indicates the event is canceled. \n");
       return;
     }
 #endif // Since ecore 1.23 version
 
-    std::string keyName( keyEvent->keyname );
-    std::string logicalKey( "" );
-    std::string keyString( "" );
-    std::string compose( "" );
+    std::string keyName(keyEvent->keyname);
+    std::string logicalKey("");
+    std::string keyString("");
+    std::string compose("");
 
     // Ensure key compose string is not NULL as keys like SHIFT or arrow have a null string.
-    if( keyEvent->compose )
+    if(keyEvent->compose)
     {
       compose = keyEvent->compose;
     }
 
     // Ensure key symbol is not NULL as keys like SHIFT have a null string.
-    if( keyEvent->key )
+    if(keyEvent->key)
     {
       logicalKey = keyEvent->key;
     }
 
-    int keyCode = KeyLookup::GetDaliKeyCode( keyEvent->keyname );
-    keyCode = ( keyCode == -1 ) ? 0 : keyCode;
-    int modifier( keyEvent->modifiers );
+    int keyCode = KeyLookup::GetDaliKeyCode(keyEvent->keyname);
+    keyCode     = (keyCode == -1) ? 0 : keyCode;
+    int           modifier(keyEvent->modifiers);
     unsigned long time = keyEvent->timestamp;
-    if( !strncmp( keyEvent->keyname, "Keycode-", 8 ) )
+    if(!strncmp(keyEvent->keyname, "Keycode-", 8))
     {
-      keyCode = atoi( keyEvent->keyname + 8 );
+      keyCode = atoi(keyEvent->keyname + 8);
     }
 
     // Ensure key event string is not NULL as keys like SHIFT have a null string.
-    if( keyEvent->string )
+    if(keyEvent->string)
     {
       keyString = keyEvent->string;
     }
 
-    std::string deviceName;
-    Device::Class::Type deviceClass;
+    std::string            deviceName;
+    Device::Class::Type    deviceClass;
     Device::Subclass::Type deviceSubclass;
 
-    GetDeviceName( keyEvent, deviceName );
-    GetDeviceClass( ecore_device_class_get( keyEvent->dev ), deviceClass );
-    GetDeviceSubclass( ecore_device_subclass_get( keyEvent->dev ), deviceSubclass );
+    GetDeviceName(keyEvent, deviceName);
+    GetDeviceClass(ecore_device_class_get(keyEvent->dev), deviceClass);
+    GetDeviceSubclass(ecore_device_subclass_get(keyEvent->dev), deviceSubclass);
 
-    Integration::KeyEvent keyEvent( keyName, logicalKey, keyString, keyCode, modifier, time, Integration::KeyEvent::Up, compose, deviceName, deviceClass, deviceSubclass );
+    Integration::KeyEvent keyEvent(keyName, logicalKey, keyString, keyCode, modifier, time, Integration::KeyEvent::UP, compose, deviceName, deviceClass, deviceSubclass);
 
-     mKeyEventSignal.Emit( keyEvent );
+    mKeyEventSignal.Emit(keyEvent);
   }
 }
 
-void WindowBaseEcoreWl::OnDataSend( void* data, int type, void* event )
+void WindowBaseEcoreWl::OnDataSend(void* data, int type, void* event)
 {
-  mSelectionDataSendSignal.Emit( event );
+  mSelectionDataSendSignal.Emit(event);
 }
 
-void WindowBaseEcoreWl::OnDataReceive( void* data, int type, void* event )
+void WindowBaseEcoreWl::OnDataReceive(void* data, int type, void* event)
 {
-  mSelectionDataReceivedSignal.Emit( event  );
+  mSelectionDataReceivedSignal.Emit(event);
 }
 
 void WindowBaseEcoreWl::OnFontNameChanged()
 {
-  mStyleChangedSignal.Emit( StyleChange::DEFAULT_FONT_CHANGE );
+  mStyleChangedSignal.Emit(StyleChange::DEFAULT_FONT_CHANGE);
 }
 
 void WindowBaseEcoreWl::OnFontSizeChanged()
 {
-  mStyleChangedSignal.Emit( StyleChange::DEFAULT_FONT_SIZE_CHANGE );
+  mStyleChangedSignal.Emit(StyleChange::DEFAULT_FONT_SIZE_CHANGE);
 }
 
-void WindowBaseEcoreWl::OnEcoreElDBusAccessibilityNotification( void* context, const Eldbus_Message* message )
+void WindowBaseEcoreWl::RegistryGlobalCallback(void* data, struct wl_registry* registry, uint32_t name, const char* interface, uint32_t version)
 {
-#ifdef DALI_ELDBUS_AVAILABLE
-  AccessibilityInfo info;
-
-  // The string defines the arg-list's respective types.
-  if( !eldbus_message_arguments_get( message, "iiiiiiu", &info.gestureValue, &info.startX, &info.startY, &info.endX, &info.endY, &info.state, &info.eventTime ) )
+  if(strcmp(interface, tizen_policy_interface.name) == 0)
   {
-    DALI_LOG_ERROR( "OnEcoreElDBusAccessibilityNotification: Error getting arguments\n" );
-  }
+    uint32_t clientVersion = std::min(version, MAX_TIZEN_CLIENT_VERSION);
 
-  mAccessibilitySignal.Emit( info );
-#endif
-}
-
-void WindowBaseEcoreWl::RegistryGlobalCallback( void* data, struct wl_registry *registry, uint32_t name, const char* interface, uint32_t version )
-{
-  if( strcmp( interface, tizen_policy_interface.name ) == 0 )
-  {
-    uint32_t clientVersion = std::min( version, MAX_TIZEN_CLIENT_VERSION );
-
-    mTizenPolicy = static_cast< tizen_policy* >( wl_registry_bind( registry, name, &tizen_policy_interface, clientVersion ) );
-    if( !mTizenPolicy )
+    mTizenPolicy = static_cast<tizen_policy*>(wl_registry_bind(registry, name, &tizen_policy_interface, clientVersion));
+    if(!mTizenPolicy)
     {
-      DALI_LOG_INFO( gWindowBaseLogFilter, Debug::General, "WindowBaseEcoreWl::RegistryGlobalCallback: wl_registry_bind(tizen_policy_interface) is failed.\n" );
+      DALI_LOG_INFO(gWindowBaseLogFilter, Debug::General, "WindowBaseEcoreWl::RegistryGlobalCallback: wl_registry_bind(tizen_policy_interface) is failed.\n");
       return;
     }
 
-    tizen_policy_add_listener( mTizenPolicy, &tizenPolicyListener, data );
+    tizen_policy_add_listener(mTizenPolicy, &tizenPolicyListener, data);
 
-    DALI_LOG_INFO( gWindowBaseLogFilter, Debug::General, "WindowBaseEcoreWl::RegistryGlobalCallback: tizen_policy_add_listener is called.\n" );
+    DALI_LOG_INFO(gWindowBaseLogFilter, Debug::General, "WindowBaseEcoreWl::RegistryGlobalCallback: tizen_policy_add_listener is called.\n");
   }
-  else if( strcmp( interface, tizen_display_policy_interface.name ) == 0 )
+  else if(strcmp(interface, tizen_display_policy_interface.name) == 0)
   {
-    mTizenDisplayPolicy = static_cast< tizen_display_policy* >( wl_registry_bind( registry, name, &tizen_display_policy_interface, version ) );
-    if( !mTizenDisplayPolicy )
+    mTizenDisplayPolicy = static_cast<tizen_display_policy*>(wl_registry_bind(registry, name, &tizen_display_policy_interface, version));
+    if(!mTizenDisplayPolicy)
     {
-      DALI_LOG_INFO( gWindowBaseLogFilter, Debug::General, "WindowBaseEcoreWl::RegistryGlobalCallback: wl_registry_bind(tizen_display_policy_interface) is failed.\n" );
+      DALI_LOG_INFO(gWindowBaseLogFilter, Debug::General, "WindowBaseEcoreWl::RegistryGlobalCallback: wl_registry_bind(tizen_display_policy_interface) is failed.\n");
       return;
     }
 
-    tizen_display_policy_add_listener( mTizenDisplayPolicy, &tizenDisplayPolicyListener, data );
+    tizen_display_policy_add_listener(mTizenDisplayPolicy, &tizenDisplayPolicyListener, data);
 
-    DALI_LOG_INFO( gWindowBaseLogFilter, Debug::General, "WindowBaseEcoreWl::RegistryGlobalCallback: tizen_display_policy_add_listener is called.\n" );
+    DALI_LOG_INFO(gWindowBaseLogFilter, Debug::General, "WindowBaseEcoreWl::RegistryGlobalCallback: tizen_display_policy_add_listener is called.\n");
   }
 }
 
-void WindowBaseEcoreWl::RegistryGlobalCallbackRemove( void* data, struct wl_registry* registry, uint32_t id )
+void WindowBaseEcoreWl::RegistryGlobalCallbackRemove(void* data, struct wl_registry* registry, uint32_t id)
 {
-  mTizenPolicy = NULL;
+  mTizenPolicy        = NULL;
   mTizenDisplayPolicy = NULL;
 }
 
-void WindowBaseEcoreWl::TizenPolicyNotificationChangeDone(void* data, struct tizen_policy* tizenPolicy, struct wl_surface* surface, int32_t level, uint32_t state )
+void WindowBaseEcoreWl::TizenPolicyNotificationChangeDone(void* data, struct tizen_policy* tizenPolicy, struct wl_surface* surface, int32_t level, uint32_t state)
 {
-  mNotificationLevel = level;
-  mNotificationChangeState = state;
+  mNotificationLevel           = level;
+  mNotificationChangeState     = state;
   mNotificationLevelChangeDone = true;
 
-  DALI_LOG_INFO( gWindowBaseLogFilter, Debug::General, "WindowBaseEcoreWl::TizenPolicyNotificationChangeDone: level = %d, state = %d\n", level, state );
+  DALI_LOG_INFO(gWindowBaseLogFilter, Debug::General, "WindowBaseEcoreWl::TizenPolicyNotificationChangeDone: level = %d, state = %d\n", level, state);
 }
 
-void WindowBaseEcoreWl::TizenPolicyScreenModeChangeDone( void* data, struct tizen_policy* tizenPolicy, struct wl_surface* surface, uint32_t mode, uint32_t state )
+void WindowBaseEcoreWl::TizenPolicyScreenModeChangeDone(void* data, struct tizen_policy* tizenPolicy, struct wl_surface* surface, uint32_t mode, uint32_t state)
 {
-  mScreenOffMode = mode;
+  mScreenOffMode            = mode;
   mScreenOffModeChangeState = state;
-  mScreenOffModeChangeDone = true;
+  mScreenOffModeChangeDone  = true;
 
-  DALI_LOG_INFO( gWindowBaseLogFilter, Debug::General, "WindowBaseEcoreWl::TizenPolicyScreenModeChangeDone: mode = %d, state = %d\n", mode, state );
+  DALI_LOG_INFO(gWindowBaseLogFilter, Debug::General, "WindowBaseEcoreWl::TizenPolicyScreenModeChangeDone: mode = %d, state = %d\n", mode, state);
 }
 
-void WindowBaseEcoreWl::DisplayPolicyBrightnessChangeDone( void* data, struct tizen_display_policy *displayPolicy, struct wl_surface* surface, int32_t brightness, uint32_t state )
+void WindowBaseEcoreWl::DisplayPolicyBrightnessChangeDone(void* data, struct tizen_display_policy* displayPolicy, struct wl_surface* surface, int32_t brightness, uint32_t state)
 {
-  mBrightness = brightness;
+  mBrightness            = brightness;
   mBrightnessChangeState = state;
-  mBrightnessChangeDone = true;
+  mBrightnessChangeDone  = true;
 
-  DALI_LOG_INFO( gWindowBaseLogFilter, Debug::General, "WindowBaseEcoreWl::DisplayPolicyBrightnessChangeDone: brightness = %d, state = %d\n", brightness, state );
+  DALI_LOG_INFO(gWindowBaseLogFilter, Debug::General, "WindowBaseEcoreWl::DisplayPolicyBrightnessChangeDone: brightness = %d, state = %d\n", brightness, state);
 }
 
 Any WindowBaseEcoreWl::GetNativeWindow()
@@ -1188,30 +1146,35 @@ Any WindowBaseEcoreWl::GetNativeWindow()
 
 int WindowBaseEcoreWl::GetNativeWindowId()
 {
-  return ecore_wl_window_id_get( mEcoreWindow );
+  return ecore_wl_window_id_get(mEcoreWindow);
+}
+
+std::string WindowBaseEcoreWl::GetNativeWindowResourceId()
+{
+  return std::string();
 }
 
-EGLNativeWindowType WindowBaseEcoreWl::CreateEglWindow( int width, int height )
+EGLNativeWindowType WindowBaseEcoreWl::CreateEglWindow(int width, int height)
 {
-  mEglWindow = wl_egl_window_create( mWlSurface, width, height );
+  mEglWindow = wl_egl_window_create(mWlSurface, width, height);
 
-  return static_cast< EGLNativeWindowType >( mEglWindow );
+  return static_cast<EGLNativeWindowType>(mEglWindow);
 }
 
 void WindowBaseEcoreWl::DestroyEglWindow()
 {
-  if( mEglWindow != NULL )
+  if(mEglWindow != NULL)
   {
-    wl_egl_window_destroy( mEglWindow );
+    wl_egl_window_destroy(mEglWindow);
     mEglWindow = NULL;
   }
 }
 
-void WindowBaseEcoreWl::SetEglWindowRotation( int angle )
+void WindowBaseEcoreWl::SetEglWindowRotation(int angle)
 {
   wl_egl_window_rotation rotation;
 
-  switch( angle )
+  switch(angle)
   {
     case 0:
     {
@@ -1240,14 +1203,14 @@ void WindowBaseEcoreWl::SetEglWindowRotation( int angle )
     }
   }
 
-  wl_egl_window_set_rotation( mEglWindow, rotation );
+  wl_egl_window_set_rotation(mEglWindow, rotation);
 }
 
-void WindowBaseEcoreWl::SetEglWindowBufferTransform( int angle )
+void WindowBaseEcoreWl::SetEglWindowBufferTransform(int angle)
 {
   wl_output_transform bufferTransform;
 
-  switch( angle )
+  switch(angle)
   {
     case 0:
     {
@@ -1276,14 +1239,14 @@ void WindowBaseEcoreWl::SetEglWindowBufferTransform( int angle )
     }
   }
 
-  wl_egl_window_set_buffer_transform( mEglWindow, bufferTransform );
+  wl_egl_window_set_buffer_transform(mEglWindow, bufferTransform);
 }
 
-void WindowBaseEcoreWl::SetEglWindowTransform( int angle )
+void WindowBaseEcoreWl::SetEglWindowTransform(int angle)
 {
   wl_output_transform windowTransform;
 
-  switch( angle )
+  switch(angle)
   {
     case 0:
     {
@@ -1312,94 +1275,125 @@ void WindowBaseEcoreWl::SetEglWindowTransform( int angle )
     }
   }
 
-  wl_egl_window_set_window_transform( mEglWindow, windowTransform );
+  wl_egl_window_set_window_transform(mEglWindow, windowTransform);
 }
 
-void WindowBaseEcoreWl::ResizeEglWindow( PositionSize positionSize )
+void WindowBaseEcoreWl::ResizeEglWindow(PositionSize positionSize)
 {
-  wl_egl_window_resize( mEglWindow, positionSize.width, positionSize.height, positionSize.x, positionSize.y );
+  wl_egl_window_resize(mEglWindow, positionSize.width, positionSize.height, positionSize.x, positionSize.y);
 }
 
 bool WindowBaseEcoreWl::IsEglWindowRotationSupported()
 {
   // Check capability
-  wl_egl_window_capability capability = static_cast< wl_egl_window_capability >( wl_egl_window_get_capabilities( mEglWindow ) );
-  if( capability == WL_EGL_WINDOW_CAPABILITY_ROTATION_SUPPORTED )
+  wl_egl_window_capability capability = static_cast<wl_egl_window_capability>(wl_egl_window_get_capabilities(mEglWindow));
+  if(capability == WL_EGL_WINDOW_CAPABILITY_ROTATION_SUPPORTED)
   {
+    mSupportedPreProtation = true;
     return true;
   }
-
+  mSupportedPreProtation = false;
   return false;
 }
 
-void WindowBaseEcoreWl::Move( PositionSize positionSize )
+void WindowBaseEcoreWl::Move(PositionSize positionSize)
+{
+  ecore_wl_window_position_set(mEcoreWindow, positionSize.x, positionSize.y);
+}
+
+void WindowBaseEcoreWl::Resize(PositionSize positionSize)
 {
-  ecore_wl_window_position_set( mEcoreWindow, positionSize.x, positionSize.y );
+  ecore_wl_window_update_size(mEcoreWindow, positionSize.width, positionSize.height);
 }
 
-void WindowBaseEcoreWl::Resize( PositionSize positionSize )
+void WindowBaseEcoreWl::MoveResize(PositionSize positionSize)
 {
-  ecore_wl_window_update_size( mEcoreWindow, positionSize.width, positionSize.height );
+  ecore_wl_window_position_set(mEcoreWindow, positionSize.x, positionSize.y);
+  ecore_wl_window_update_size(mEcoreWindow, positionSize.width, positionSize.height);
 }
 
-void WindowBaseEcoreWl::MoveResize( PositionSize positionSize )
+void WindowBaseEcoreWl::SetLayout(unsigned int numCols, unsigned int numRows, unsigned int column, unsigned int row, unsigned int colSpan, unsigned int rowSpan)
 {
-  ecore_wl_window_position_set( mEcoreWindow, positionSize.x, positionSize.y );
-  ecore_wl_window_update_size( mEcoreWindow, positionSize.width, positionSize.height );
 }
 
-void WindowBaseEcoreWl::SetClass( const std::string& name, const std::string& className )
+void WindowBaseEcoreWl::SetClass(const std::string& name, const std::string& className)
 {
-  ecore_wl_window_title_set( mEcoreWindow, name.c_str() );
-  ecore_wl_window_class_name_set( mEcoreWindow, className.c_str() );
+  ecore_wl_window_title_set(mEcoreWindow, name.c_str());
+  ecore_wl_window_class_name_set(mEcoreWindow, className.c_str());
 }
 
 void WindowBaseEcoreWl::Raise()
 {
   // Use ecore_wl_window_activate to prevent the window shown without rendering
-  ecore_wl_window_activate( mEcoreWindow );
+  ecore_wl_window_activate(mEcoreWindow);
 }
 
 void WindowBaseEcoreWl::Lower()
 {
-  ecore_wl_window_lower( mEcoreWindow );
+  ecore_wl_window_lower(mEcoreWindow);
 }
 
 void WindowBaseEcoreWl::Activate()
 {
-  ecore_wl_window_activate( mEcoreWindow );
+  ecore_wl_window_activate(mEcoreWindow);
+}
+
+void WindowBaseEcoreWl::Maximize(bool maximize)
+{
+}
+
+bool WindowBaseEcoreWl::IsMaximized() const
+{
+  return false;
+}
+
+void WindowBaseEcoreWl::SetMaximumSize(Dali::Window::WindowSize size)
+{
 }
 
-void WindowBaseEcoreWl::SetAvailableAnlges( const std::vector< int >& angles )
+void WindowBaseEcoreWl::Minimize(bool minimize)
 {
-  int rotations[4] = { 0 };
-  DALI_LOG_RELEASE_INFO( "WindowBaseEcoreWl::SetAvailableAnlges, angle's count: %d\n", angles.size() );
-  for( std::size_t i = 0; i < angles.size(); ++i )
+}
+
+bool WindowBaseEcoreWl::IsMinimized() const
+{
+  return false;
+}
+
+void WindowBaseEcoreWl::SetMimimumSize(Dali::Window::WindowSize size)
+{
+}
+
+void WindowBaseEcoreWl::SetAvailableAnlges(const std::vector<int>& angles)
+{
+  int rotations[4] = {0};
+  DALI_LOG_RELEASE_INFO("WindowBaseEcoreWl::SetAvailableAnlges, angle's count: %d\n", angles.size());
+  for(std::size_t i = 0; i < angles.size(); ++i)
   {
-    rotations[i] = static_cast< int >( angles[i] );
-    DALI_LOG_RELEASE_INFO( "%d ", rotations[i] );
+    rotations[i] = static_cast<int>(angles[i]);
+    DALI_LOG_RELEASE_INFO("%d ", rotations[i]);
   }
-  ecore_wl_window_rotation_available_rotations_set( mEcoreWindow, rotations, angles.size() );
+  ecore_wl_window_rotation_available_rotations_set(mEcoreWindow, rotations, angles.size());
 }
 
-void WindowBaseEcoreWl::SetPreferredAngle( int angle )
+void WindowBaseEcoreWl::SetPreferredAngle(int angle)
 {
-  ecore_wl_window_rotation_preferred_rotation_set( mEcoreWindow, angle );
+  ecore_wl_window_rotation_preferred_rotation_set(mEcoreWindow, angle);
 }
 
-void WindowBaseEcoreWl::SetAcceptFocus( bool accept )
+void WindowBaseEcoreWl::SetAcceptFocus(bool accept)
 {
-  ecore_wl_window_focus_skip_set( mEcoreWindow, !accept );
+  ecore_wl_window_focus_skip_set(mEcoreWindow, !accept);
 }
 
 void WindowBaseEcoreWl::Show()
 {
-  ecore_wl_window_show( mEcoreWindow );
+  ecore_wl_window_show(mEcoreWindow);
 }
 
 void WindowBaseEcoreWl::Hide()
 {
-  ecore_wl_window_hide( mEcoreWindow );
+  ecore_wl_window_hide(mEcoreWindow);
 }
 
 unsigned int WindowBaseEcoreWl::GetSupportedAuxiliaryHintCount() const
@@ -1407,152 +1401,152 @@ unsigned int WindowBaseEcoreWl::GetSupportedAuxiliaryHintCount() const
   return mSupportedAuxiliaryHints.size();
 }
 
-std::string WindowBaseEcoreWl::GetSupportedAuxiliaryHint( unsigned int index ) const
+std::string WindowBaseEcoreWl::GetSupportedAuxiliaryHint(unsigned int index) const
 {
-  if( index >= GetSupportedAuxiliaryHintCount() )
+  if(index >= GetSupportedAuxiliaryHintCount())
   {
-    DALI_LOG_INFO( gWindowBaseLogFilter, Debug::Verbose, "WindowBaseEcoreWl::GetSupportedAuxiliaryHint: Invalid index! [%d]\n", index );
+    DALI_LOG_INFO(gWindowBaseLogFilter, Debug::Verbose, "WindowBaseEcoreWl::GetSupportedAuxiliaryHint: Invalid index! [%d]\n", index);
   }
 
   return mSupportedAuxiliaryHints[index];
 }
 
-unsigned int WindowBaseEcoreWl::AddAuxiliaryHint( const std::string& hint, const std::string& value )
+unsigned int WindowBaseEcoreWl::AddAuxiliaryHint(const std::string& hint, const std::string& value)
 {
   bool supported = false;
 
   // Check if the hint is suppported
-  for( std::vector< std::string >::iterator iter = mSupportedAuxiliaryHints.begin(); iter != mSupportedAuxiliaryHints.end(); ++iter )
+  for(std::vector<std::string>::iterator iter = mSupportedAuxiliaryHints.begin(); iter != mSupportedAuxiliaryHints.end(); ++iter)
   {
-    if( *iter == hint )
+    if(*iter == hint)
     {
       supported = true;
       break;
     }
   }
 
-  if( !supported )
+  if(!supported)
   {
-    DALI_LOG_INFO( gWindowBaseLogFilter, Debug::Concise, "WindowBaseEcoreWl::AddAuxiliaryHint: Not supported auxiliary hint [%s]\n", hint.c_str() );
+    DALI_LOG_INFO(gWindowBaseLogFilter, Debug::Concise, "WindowBaseEcoreWl::AddAuxiliaryHint: Not supported auxiliary hint [%s]\n", hint.c_str());
     return 0;
   }
 
   // Check if the hint is already added
-  for( unsigned int i = 0; i < mAuxiliaryHints.size(); i++ )
+  for(unsigned int i = 0; i < mAuxiliaryHints.size(); i++)
   {
-    if( mAuxiliaryHints[i].first == hint )
+    if(mAuxiliaryHints[i].first == hint)
     {
       // Just change the value
       mAuxiliaryHints[i].second = value;
 
-      DALI_LOG_INFO( gWindowBaseLogFilter, Debug::Verbose, "WindowBaseEcoreWl::AddAuxiliaryHint: Change! hint = %s, value = %s, id = %d\n", hint.c_str(), value.c_str(), i + 1 );
+      DALI_LOG_INFO(gWindowBaseLogFilter, Debug::Verbose, "WindowBaseEcoreWl::AddAuxiliaryHint: Change! hint = %s, value = %s, id = %d\n", hint.c_str(), value.c_str(), i + 1);
 
-      return i + 1;   // id is index + 1
+      return i + 1; // id is index + 1
     }
   }
 
   // Add the hint
-  mAuxiliaryHints.push_back( std::pair< std::string, std::string >( hint, value ) );
+  mAuxiliaryHints.push_back(std::pair<std::string, std::string>(hint, value));
 
   unsigned int id = mAuxiliaryHints.size();
 
-  ecore_wl_window_aux_hint_add( mEcoreWindow, static_cast< int >( id ), hint.c_str(), value.c_str() );
+  ecore_wl_window_aux_hint_add(mEcoreWindow, static_cast<int>(id), hint.c_str(), value.c_str());
 
-  DALI_LOG_INFO( gWindowBaseLogFilter, Debug::Verbose, "WindowBaseEcoreWl::AddAuxiliaryHint: hint = %s, value = %s, id = %d\n", hint.c_str(), value.c_str(), id );
+  DALI_LOG_INFO(gWindowBaseLogFilter, Debug::Verbose, "WindowBaseEcoreWl::AddAuxiliaryHint: hint = %s, value = %s, id = %d\n", hint.c_str(), value.c_str(), id);
 
   return id;
 }
 
-bool WindowBaseEcoreWl::RemoveAuxiliaryHint( unsigned int id )
+bool WindowBaseEcoreWl::RemoveAuxiliaryHint(unsigned int id)
 {
-  if( id == 0 || id > mAuxiliaryHints.size() )
+  if(id == 0 || id > mAuxiliaryHints.size())
   {
-    DALI_LOG_INFO( gWindowBaseLogFilter, Debug::Concise, "WindowBaseEcoreWl::RemoveAuxiliaryHint: Invalid id [%d]\n", id );
+    DALI_LOG_INFO(gWindowBaseLogFilter, Debug::Concise, "WindowBaseEcoreWl::RemoveAuxiliaryHint: Invalid id [%d]\n", id);
     return false;
   }
 
   mAuxiliaryHints[id - 1].second = std::string();
 
-  ecore_wl_window_aux_hint_del( mEcoreWindow, static_cast< int >( id ) );
+  ecore_wl_window_aux_hint_del(mEcoreWindow, static_cast<int>(id));
 
-  DALI_LOG_INFO( gWindowBaseLogFilter, Debug::Verbose, "WindowBaseEcoreWl::RemoveAuxiliaryHint: id = %d, hint = %s\n", id, mAuxiliaryHints[id - 1].first.c_str() );
+  DALI_LOG_INFO(gWindowBaseLogFilter, Debug::Verbose, "WindowBaseEcoreWl::RemoveAuxiliaryHint: id = %d, hint = %s\n", id, mAuxiliaryHints[id - 1].first.c_str());
 
   return true;
 }
 
-bool WindowBaseEcoreWl::SetAuxiliaryHintValue( unsigned int id, const std::string& value )
+bool WindowBaseEcoreWl::SetAuxiliaryHintValue(unsigned int id, const std::string& value)
 {
-  if( id == 0 || id > mAuxiliaryHints.size() )
+  if(id == 0 || id > mAuxiliaryHints.size())
   {
-    DALI_LOG_INFO( gWindowBaseLogFilter, Debug::Concise, "WindowBaseEcoreWl::SetAuxiliaryHintValue: Invalid id [%d]\n", id );
+    DALI_LOG_INFO(gWindowBaseLogFilter, Debug::Concise, "WindowBaseEcoreWl::SetAuxiliaryHintValue: Invalid id [%d]\n", id);
     return false;
   }
 
   mAuxiliaryHints[id - 1].second = value;
 
-  ecore_wl_window_aux_hint_change( mEcoreWindow, static_cast< int >( id ), value.c_str() );
+  ecore_wl_window_aux_hint_change(mEcoreWindow, static_cast<int>(id), value.c_str());
 
-  DALI_LOG_INFO( gWindowBaseLogFilter, Debug::Verbose, "WindowBaseEcoreWl::SetAuxiliaryHintValue: id = %d, hint = %s, value = %s\n", id, mAuxiliaryHints[id - 1].first.c_str(), mAuxiliaryHints[id - 1].second.c_str() );
+  DALI_LOG_INFO(gWindowBaseLogFilter, Debug::Verbose, "WindowBaseEcoreWl::SetAuxiliaryHintValue: id = %d, hint = %s, value = %s\n", id, mAuxiliaryHints[id - 1].first.c_str(), mAuxiliaryHints[id - 1].second.c_str());
 
   return true;
 }
 
-std::string WindowBaseEcoreWl::GetAuxiliaryHintValue( unsigned int id ) const
+std::string WindowBaseEcoreWl::GetAuxiliaryHintValue(unsigned int id) const
 {
-  if( id == 0 || id > mAuxiliaryHints.size() )
+  if(id == 0 || id > mAuxiliaryHints.size())
   {
-    DALI_LOG_INFO( gWindowBaseLogFilter, Debug::Concise, "WindowBaseEcoreWl::GetAuxiliaryHintValue: Invalid id [%d]\n", id );
+    DALI_LOG_INFO(gWindowBaseLogFilter, Debug::Concise, "WindowBaseEcoreWl::GetAuxiliaryHintValue: Invalid id [%d]\n", id);
     return std::string();
   }
 
-  DALI_LOG_INFO( gWindowBaseLogFilter, Debug::Verbose, "WindowBaseEcoreWl::GetAuxiliaryHintValue: id = %d, hint = %s, value = %s\n", id, mAuxiliaryHints[id - 1].first.c_str(), mAuxiliaryHints[id - 1].second.c_str() );
+  DALI_LOG_INFO(gWindowBaseLogFilter, Debug::Verbose, "WindowBaseEcoreWl::GetAuxiliaryHintValue: id = %d, hint = %s, value = %s\n", id, mAuxiliaryHints[id - 1].first.c_str(), mAuxiliaryHints[id - 1].second.c_str());
 
   return mAuxiliaryHints[id - 1].second;
 }
 
-unsigned int WindowBaseEcoreWl::GetAuxiliaryHintId( const std::string& hint ) const
+unsigned int WindowBaseEcoreWl::GetAuxiliaryHintId(const std::string& hint) const
 {
-  for( unsigned int i = 0; i < mAuxiliaryHints.size(); i++ )
+  for(unsigned int i = 0; i < mAuxiliaryHints.size(); i++)
   {
-    if( mAuxiliaryHints[i].first == hint )
+    if(mAuxiliaryHints[i].first == hint)
     {
-      DALI_LOG_INFO( gWindowBaseLogFilter, Debug::Verbose, "WindowBaseEcoreWl::GetAuxiliaryHintId: hint = %s, id = %d\n", hint.c_str(), i + 1 );
+      DALI_LOG_INFO(gWindowBaseLogFilter, Debug::Verbose, "WindowBaseEcoreWl::GetAuxiliaryHintId: hint = %s, id = %d\n", hint.c_str(), i + 1);
       return i + 1;
     }
   }
 
-  DALI_LOG_INFO( gWindowBaseLogFilter, Debug::Verbose, "WindowBaseEcoreWl::GetAuxiliaryHintId: Invalid hint! [%s]\n", hint.c_str() );
+  DALI_LOG_INFO(gWindowBaseLogFilter, Debug::Verbose, "WindowBaseEcoreWl::GetAuxiliaryHintId: Invalid hint! [%s]\n", hint.c_str());
 
   return 0;
 }
 
-void WindowBaseEcoreWl::SetInputRegion( const Rect< int >& inputRegion )
+void WindowBaseEcoreWl::SetInputRegion(const Rect<int>& inputRegion)
 {
-  ecore_wl_window_input_region_set( mEcoreWindow, inputRegion.x, inputRegion.y, inputRegion.width, inputRegion.height );
+  ecore_wl_window_input_region_set(mEcoreWindow, inputRegion.x, inputRegion.y, inputRegion.width, inputRegion.height);
 }
 
-void WindowBaseEcoreWl::SetType( Dali::Window::Type type )
+void WindowBaseEcoreWl::SetType(Dali::WindowType type)
 {
   Ecore_Wl_Window_Type windowType;
 
-  switch( type )
+  switch(type)
   {
-    case Dali::Window::NORMAL:
+    case Dali::WindowType::NORMAL:
     {
       windowType = ECORE_WL_WINDOW_TYPE_TOPLEVEL;
       break;
     }
-    case Dali::Window::NOTIFICATION:
+    case Dali::WindowType::NOTIFICATION:
     {
       windowType = ECORE_WL_WINDOW_TYPE_NOTIFICATION;
       break;
     }
-    case Dali::Window::UTILITY:
+    case Dali::WindowType::UTILITY:
     {
       windowType = ECORE_WL_WINDOW_TYPE_UTILITY;
       break;
     }
-    case Dali::Window::DIALOG:
+    case Dali::WindowType::DIALOG:
     {
       windowType = ECORE_WL_WINDOW_TYPE_DIALOG;
       break;
@@ -1564,322 +1558,327 @@ void WindowBaseEcoreWl::SetType( Dali::Window::Type type )
     }
   }
 
-  ecore_wl_window_type_set( mEcoreWindow, windowType );
+  ecore_wl_window_type_set(mEcoreWindow, windowType);
 }
 
-bool WindowBaseEcoreWl::SetNotificationLevel( Dali::Window::NotificationLevel::Type level )
+Dali::WindowType WindowBaseEcoreWl::GetType() const
 {
-  while( !mTizenPolicy )
+  return Dali::WindowType::NORMAL;
+}
+
+Dali::WindowOperationResult WindowBaseEcoreWl::SetNotificationLevel(Dali::WindowNotificationLevel level)
+{
+  while(!mTizenPolicy)
   {
-    wl_display_dispatch_queue( mDisplay, mEventQueue );
+    wl_display_dispatch_queue(mDisplay, mEventQueue);
   }
 
   int notificationLevel;
 
-  switch( level )
+  switch(level)
   {
-    case Dali::Window::NotificationLevel::NONE:
+    case Dali::WindowNotificationLevel::NONE:
     {
       notificationLevel = TIZEN_POLICY_LEVEL_NONE;
       break;
     }
-    case Dali::Window::NotificationLevel::BASE:
+    case Dali::WindowNotificationLevel::BASE:
     {
       notificationLevel = TIZEN_POLICY_LEVEL_DEFAULT;
       break;
     }
-    case Dali::Window::NotificationLevel::MEDIUM:
+    case Dali::WindowNotificationLevel::MEDIUM:
     {
       notificationLevel = TIZEN_POLICY_LEVEL_MEDIUM;
       break;
     }
-    case Dali::Window::NotificationLevel::HIGH:
+    case Dali::WindowNotificationLevel::HIGH:
     {
       notificationLevel = TIZEN_POLICY_LEVEL_HIGH;
       break;
     }
-    case Dali::Window::NotificationLevel::TOP:
+    case Dali::WindowNotificationLevel::TOP:
     {
       notificationLevel = TIZEN_POLICY_LEVEL_TOP;
       break;
     }
     default:
     {
-      DALI_LOG_INFO( gWindowBaseLogFilter, Debug::Verbose, "WindowBaseEcoreWl::SetNotificationLevel: invalid level [%d]\n", level );
+      DALI_LOG_INFO(gWindowBaseLogFilter, Debug::Verbose, "WindowBaseEcoreWl::SetNotificationLevel: invalid level [%d]\n", level);
       notificationLevel = TIZEN_POLICY_LEVEL_DEFAULT;
       break;
     }
   }
 
   mNotificationLevelChangeDone = false;
-  mNotificationChangeState = TIZEN_POLICY_ERROR_STATE_NONE;
+  mNotificationChangeState     = TIZEN_POLICY_ERROR_STATE_NONE;
 
-  tizen_policy_set_notification_level( mTizenPolicy, ecore_wl_window_surface_get( mEcoreWindow ), notificationLevel );
+  tizen_policy_set_notification_level(mTizenPolicy, ecore_wl_window_surface_get(mEcoreWindow), notificationLevel);
 
   int count = 0;
 
-  while( !mNotificationLevelChangeDone && count < 3 )
+  while(!mNotificationLevelChangeDone && count < 3)
   {
     ecore_wl_flush();
-    wl_display_dispatch_queue( mDisplay, mEventQueue );
+    wl_display_dispatch_queue(mDisplay, mEventQueue);
     count++;
   }
 
-  if( !mNotificationLevelChangeDone )
+  if(!mNotificationLevelChangeDone)
   {
-    DALI_LOG_INFO( gWindowBaseLogFilter, Debug::Verbose, "WindowBaseEcoreWl::SetNotificationLevel: Level change is failed [%d, %d]\n", level, mNotificationChangeState );
-    return false;
+    DALI_LOG_INFO(gWindowBaseLogFilter, Debug::Verbose, "WindowBaseEcoreWl::SetNotificationLevel: Level change is failed [%d, %d]\n", level, mNotificationChangeState);
+    return Dali::WindowOperationResult::UNKNOWN_ERROR;
   }
-  else if( mNotificationChangeState == TIZEN_POLICY_ERROR_STATE_PERMISSION_DENIED )
+  else if(mNotificationChangeState == TIZEN_POLICY_ERROR_STATE_PERMISSION_DENIED)
   {
-    DALI_LOG_INFO( gWindowBaseLogFilter, Debug::Verbose, "WindowBaseEcoreWl::SetNotificationLevel: Permission denied! [%d]\n", level );
-    return false;
+    DALI_LOG_INFO(gWindowBaseLogFilter, Debug::Verbose, "WindowBaseEcoreWl::SetNotificationLevel: Permission denied! [%d]\n", level);
+    return Dali::WindowOperationResult::PERMISSION_DENIED;
   }
 
-  DALI_LOG_INFO( gWindowBaseLogFilter, Debug::Verbose, "WindowBaseEcoreWl::SetNotificationLevel: Level is changed [%d]\n", mNotificationLevel );
+  DALI_LOG_INFO(gWindowBaseLogFilter, Debug::Verbose, "WindowBaseEcoreWl::SetNotificationLevel: Level is changed [%d]\n", mNotificationLevel);
 
-  return true;
+  return Dali::WindowOperationResult::SUCCEED;
 }
 
-Dali::Window::NotificationLevel::Type WindowBaseEcoreWl::GetNotificationLevel() const
+Dali::WindowNotificationLevel WindowBaseEcoreWl::GetNotificationLevel() const
 {
-  while( !mTizenPolicy )
+  while(!mTizenPolicy)
   {
-    wl_display_dispatch_queue( mDisplay, mEventQueue );
+    wl_display_dispatch_queue(mDisplay, mEventQueue);
   }
 
   int count = 0;
 
-  while( !mNotificationLevelChangeDone && count < 3 )
+  while(!mNotificationLevelChangeDone && count < 3)
   {
     ecore_wl_flush();
-    wl_display_dispatch_queue( mDisplay, mEventQueue );
+    wl_display_dispatch_queue(mDisplay, mEventQueue);
     count++;
   }
 
-  if( !mNotificationLevelChangeDone )
+  if(!mNotificationLevelChangeDone)
   {
-    DALI_LOG_INFO( gWindowBaseLogFilter, Debug::Verbose, "WindowBaseEcoreWl::GetNotificationLevel: Error! [%d]\n", mNotificationChangeState );
+    DALI_LOG_INFO(gWindowBaseLogFilter, Debug::Verbose, "WindowBaseEcoreWl::GetNotificationLevel: Error! [%d]\n", mNotificationChangeState);
     return Dali::Window::NotificationLevel::NONE;
   }
 
-  Dali::Window::NotificationLevel::Type level;
+  Dali::WindowNotificationLevel level;
 
-  switch( mNotificationLevel )
+  switch(mNotificationLevel)
   {
     case TIZEN_POLICY_LEVEL_NONE:
     {
-      level = Dali::Window::NotificationLevel::NONE;
+      level = Dali::WindowNotificationLevel::NONE;
       break;
     }
     case TIZEN_POLICY_LEVEL_DEFAULT:
     {
-      level = Dali::Window::NotificationLevel::BASE;
+      level = Dali::WindowNotificationLevel::BASE;
       break;
     }
     case TIZEN_POLICY_LEVEL_MEDIUM:
     {
-      level = Dali::Window::NotificationLevel::MEDIUM;
+      level = Dali::WindowNotificationLevel::MEDIUM;
       break;
     }
     case TIZEN_POLICY_LEVEL_HIGH:
     {
-      level = Dali::Window::NotificationLevel::HIGH;
+      level = Dali::WindowNotificationLevel::HIGH;
       break;
     }
     case TIZEN_POLICY_LEVEL_TOP:
     {
-      level = Dali::Window::NotificationLevel::TOP;
+      level = Dali::WindowNotificationLevel::TOP;
       break;
     }
     default:
     {
-      DALI_LOG_INFO( gWindowBaseLogFilter, Debug::Verbose, "WindowBaseEcoreWl::GetNotificationLevel: invalid level [%d]\n", mNotificationLevel );
-      level = Dali::Window::NotificationLevel::NONE;
+      DALI_LOG_INFO(gWindowBaseLogFilter, Debug::Verbose, "WindowBaseEcoreWl::GetNotificationLevel: invalid level [%d]\n", mNotificationLevel);
+      level = Dali::WindowNotificationLevel::NONE;
       break;
     }
   }
 
-  DALI_LOG_INFO( gWindowBaseLogFilter, Debug::Verbose, "WindowBaseEcoreWl::GetNotificationLevel: level [%d]\n", mNotificationLevel );
+  DALI_LOG_INFO(gWindowBaseLogFilter, Debug::Verbose, "WindowBaseEcoreWl::GetNotificationLevel: level [%d]\n", mNotificationLevel);
 
   return level;
 }
 
-void WindowBaseEcoreWl::SetOpaqueState( bool opaque )
+void WindowBaseEcoreWl::SetOpaqueState(bool opaque)
 {
-  while( !mTizenPolicy )
+  while(!mTizenPolicy)
   {
-    wl_display_dispatch_queue( mDisplay, mEventQueue );
+    wl_display_dispatch_queue(mDisplay, mEventQueue);
   }
 
-  tizen_policy_set_opaque_state( mTizenPolicy, ecore_wl_window_surface_get( mEcoreWindow ), ( opaque ? 1 : 0 ) );
+  tizen_policy_set_opaque_state(mTizenPolicy, ecore_wl_window_surface_get(mEcoreWindow), (opaque ? 1 : 0));
 }
 
-bool WindowBaseEcoreWl::SetScreenOffMode(Dali::Window::ScreenOffMode::Type screenOffMode)
+Dali::WindowOperationResult WindowBaseEcoreWl::SetScreenOffMode(WindowScreenOffMode screenOffMode)
 {
-  while( !mTizenPolicy )
+  while(!mTizenPolicy)
   {
-    wl_display_dispatch_queue( mDisplay, mEventQueue );
+    wl_display_dispatch_queue(mDisplay, mEventQueue);
   }
 
-  mScreenOffModeChangeDone = false;
+  mScreenOffModeChangeDone  = false;
   mScreenOffModeChangeState = TIZEN_POLICY_ERROR_STATE_NONE;
 
   unsigned int mode = 0;
 
-  switch( screenOffMode )
+  switch(screenOffMode)
   {
-    case Dali::Window::ScreenOffMode::TIMEOUT:
+    case WindowScreenOffMode::TIMEOUT:
     {
       mode = 0;
       break;
     }
-    case Dali::Window::ScreenOffMode::NEVER:
+    case WindowScreenOffMode::NEVER:
     {
       mode = 1;
       break;
     }
   }
 
-  tizen_policy_set_window_screen_mode( mTizenPolicy, ecore_wl_window_surface_get( mEcoreWindow ), mode );
+  tizen_policy_set_window_screen_mode(mTizenPolicy, ecore_wl_window_surface_get(mEcoreWindow), mode);
 
   int count = 0;
 
-  while( !mScreenOffModeChangeDone && count < 3 )
+  while(!mScreenOffModeChangeDone && count < 3)
   {
     ecore_wl_flush();
-    wl_display_dispatch_queue( mDisplay, mEventQueue );
+    wl_display_dispatch_queue(mDisplay, mEventQueue);
     count++;
   }
 
-  if( !mScreenOffModeChangeDone )
+  if(!mScreenOffModeChangeDone)
   {
-    DALI_LOG_INFO( gWindowBaseLogFilter, Debug::Verbose, "WindowBaseEcoreWl::SetScreenOffMode: Screen mode change is failed [%d, %d]\n", screenOffMode, mScreenOffModeChangeState );
-    return false;
+    DALI_LOG_INFO(gWindowBaseLogFilter, Debug::Verbose, "WindowBaseEcoreWl::SetScreenOffMode: Screen mode change is failed [%d, %d]\n", screenOffMode, mScreenOffModeChangeState);
+    return Dali::WindowOperationResult::UNKNOWN_ERROR;
   }
-  else if( mScreenOffModeChangeState == TIZEN_POLICY_ERROR_STATE_PERMISSION_DENIED )
+  else if(mScreenOffModeChangeState == TIZEN_POLICY_ERROR_STATE_PERMISSION_DENIED)
   {
-    DALI_LOG_INFO( gWindowBaseLogFilter, Debug::Verbose, "WindowBaseEcoreWl::SetScreenOffMode: Permission denied! [%d]\n", screenOffMode );
-    return false;
+    DALI_LOG_INFO(gWindowBaseLogFilter, Debug::Verbose, "WindowBaseEcoreWl::SetScreenOffMode: Permission denied! [%d]\n", screenOffMode);
+    return Dali::WindowOperationResult::PERMISSION_DENIED;
   }
 
-  DALI_LOG_INFO( gWindowBaseLogFilter, Debug::Verbose, "WindowBaseEcoreWl::SetScreenOffMode: Screen mode is changed [%d]\n", mScreenOffMode );
+  DALI_LOG_INFO(gWindowBaseLogFilter, Debug::Verbose, "WindowBaseEcoreWl::SetScreenOffMode: Screen mode is changed [%d]\n", mScreenOffMode);
 
-  return true;
+  return Dali::WindowOperationResult::SUCCEED;
 }
 
-Dali::Window::ScreenOffMode::Type WindowBaseEcoreWl::GetScreenOffMode() const
+WindowScreenOffMode WindowBaseEcoreWl::GetScreenOffMode() const
 {
-  while( !mTizenPolicy )
+  while(!mTizenPolicy)
   {
-    wl_display_dispatch_queue( mDisplay, mEventQueue );
+    wl_display_dispatch_queue(mDisplay, mEventQueue);
   }
 
   int count = 0;
 
-  while( !mScreenOffModeChangeDone && count < 3 )
+  while(!mScreenOffModeChangeDone && count < 3)
   {
     ecore_wl_flush();
-    wl_display_dispatch_queue( mDisplay, mEventQueue );
+    wl_display_dispatch_queue(mDisplay, mEventQueue);
     count++;
   }
 
-  if( !mScreenOffModeChangeDone )
+  if(!mScreenOffModeChangeDone)
   {
-    DALI_LOG_INFO( gWindowBaseLogFilter, Debug::Verbose, "WindowBaseEcoreWl::GetScreenOffMode: Error! [%d]\n", mScreenOffModeChangeState );
-    return Dali::Window::ScreenOffMode::TIMEOUT;
+    DALI_LOG_INFO(gWindowBaseLogFilter, Debug::Verbose, "WindowBaseEcoreWl::GetScreenOffMode: Error! [%d]\n", mScreenOffModeChangeState);
+    return WindowScreenOffMode::TIMEOUT;
   }
 
-  Dali::Window::ScreenOffMode::Type screenMode = Dali::Window::ScreenOffMode::TIMEOUT;
+  WindowScreenOffMode screenMode = WindowScreenOffMode::TIMEOUT;
 
-  switch( mScreenOffMode )
+  switch(mScreenOffMode)
   {
     case 0:
     {
-      screenMode = Dali::Window::ScreenOffMode::TIMEOUT;
+      screenMode = WindowScreenOffMode::TIMEOUT;
       break;
     }
     case 1:
     {
-      screenMode = Dali::Window::ScreenOffMode::NEVER;
+      screenMode = WindowScreenOffMode::NEVER;
       break;
     }
   }
 
-  DALI_LOG_INFO( gWindowBaseLogFilter, Debug::Verbose, "WindowBaseEcoreWl::GetScreenOffMode: screen mode [%d]\n", mScreenOffMode );
+  DALI_LOG_INFO(gWindowBaseLogFilter, Debug::Verbose, "WindowBaseEcoreWl::GetScreenOffMode: screen mode [%d]\n", mScreenOffMode);
 
   return screenMode;
 }
 
-bool WindowBaseEcoreWl::SetBrightness( int brightness )
+Dali::WindowOperationResult WindowBaseEcoreWl::SetBrightness(int brightness)
 {
-  while( !mTizenDisplayPolicy )
+  while(!mTizenDisplayPolicy)
   {
-    wl_display_dispatch_queue( mDisplay, mEventQueue );
+    wl_display_dispatch_queue(mDisplay, mEventQueue);
   }
 
-  mBrightnessChangeDone = false;
+  mBrightnessChangeDone  = false;
   mBrightnessChangeState = TIZEN_POLICY_ERROR_STATE_NONE;
 
-  tizen_display_policy_set_window_brightness( mTizenDisplayPolicy, ecore_wl_window_surface_get( mEcoreWindow ), brightness );
+  tizen_display_policy_set_window_brightness(mTizenDisplayPolicy, ecore_wl_window_surface_get(mEcoreWindow), brightness);
 
   int count = 0;
 
-  while( !mBrightnessChangeDone && count < 3 )
+  while(!mBrightnessChangeDone && count < 3)
   {
     ecore_wl_flush();
-    wl_display_dispatch_queue( mDisplay, mEventQueue );
+    wl_display_dispatch_queue(mDisplay, mEventQueue);
     count++;
   }
 
-  if( !mBrightnessChangeDone )
+  if(!mBrightnessChangeDone)
   {
-    DALI_LOG_INFO( gWindowBaseLogFilter, Debug::Verbose, "WindowBaseEcoreWl::SetBrightness: Brightness change is failed [%d, %d]\n", brightness, mBrightnessChangeState );
-    return false;
+    DALI_LOG_INFO(gWindowBaseLogFilter, Debug::Verbose, "WindowBaseEcoreWl::SetBrightness: Brightness change is failed [%d, %d]\n", brightness, mBrightnessChangeState);
+    return Dali::WindowOperationResult::UNKNOWN_ERROR;
   }
-  else if( mBrightnessChangeState == TIZEN_POLICY_ERROR_STATE_PERMISSION_DENIED )
+  else if(mBrightnessChangeState == TIZEN_POLICY_ERROR_STATE_PERMISSION_DENIED)
   {
-    DALI_LOG_INFO( gWindowBaseLogFilter, Debug::Verbose, "WindowBaseEcoreWl::SetBrightness: Permission denied! [%d]\n", brightness );
-    return false;
+    DALI_LOG_INFO(gWindowBaseLogFilter, Debug::Verbose, "WindowBaseEcoreWl::SetBrightness: Permission denied! [%d]\n", brightness);
+    return Dali::WindowOperationResult::PERMISSION_DENIED;
   }
 
-  DALI_LOG_INFO( gWindowBaseLogFilter, Debug::Verbose, "WindowBaseEcoreWl::SetBrightness: Brightness is changed [%d]\n", mBrightness );
+  DALI_LOG_INFO(gWindowBaseLogFilter, Debug::Verbose, "WindowBaseEcoreWl::SetBrightness: Brightness is changed [%d]\n", mBrightness);
 
-  return true;
+  return Dali::WindowOperationResult::SUCCEED;
 }
 
 int WindowBaseEcoreWl::GetBrightness() const
 {
-  while( !mTizenDisplayPolicy )
+  while(!mTizenDisplayPolicy)
   {
-    wl_display_dispatch_queue( mDisplay, mEventQueue );
+    wl_display_dispatch_queue(mDisplay, mEventQueue);
   }
 
   int count = 0;
 
-  while( !mBrightnessChangeDone && count < 3 )
+  while(!mBrightnessChangeDone && count < 3)
   {
     ecore_wl_flush();
-    wl_display_dispatch_queue( mDisplay, mEventQueue );
+    wl_display_dispatch_queue(mDisplay, mEventQueue);
     count++;
   }
 
-  if( !mBrightnessChangeDone )
+  if(!mBrightnessChangeDone)
   {
-    DALI_LOG_INFO( gWindowBaseLogFilter, Debug::Verbose, "WindowBaseEcoreWl::GetBrightness: Error! [%d]\n", mBrightnessChangeState );
+    DALI_LOG_INFO(gWindowBaseLogFilter, Debug::Verbose, "WindowBaseEcoreWl::GetBrightness: Error! [%d]\n", mBrightnessChangeState);
     return 0;
   }
 
-  DALI_LOG_INFO( gWindowBaseLogFilter, Debug::Verbose, "WindowBaseEcoreWl::GetBrightness: Brightness [%d]\n", mBrightness );
+  DALI_LOG_INFO(gWindowBaseLogFilter, Debug::Verbose, "WindowBaseEcoreWl::GetBrightness: Brightness [%d]\n", mBrightness);
 
   return mBrightness;
 }
 
-bool WindowBaseEcoreWl::GrabKey( Dali::KEY key, KeyGrab::KeyGrabMode grabMode )
+bool WindowBaseEcoreWl::GrabKey(Dali::KEY key, KeyGrab::KeyGrabMode grabMode)
 {
   Ecore_Wl_Window_Keygrab_Mode mode;
 
-  switch( grabMode )
+  switch(grabMode)
   {
     case KeyGrab::TOPMOST:
     {
@@ -1907,34 +1906,34 @@ bool WindowBaseEcoreWl::GrabKey( Dali::KEY key, KeyGrab::KeyGrabMode grabMode )
     }
   }
 
-  return ecore_wl_window_keygrab_set( mEcoreWindow, KeyLookup::GetKeyName( key ), 0, 0, 0, mode );
+  return ecore_wl_window_keygrab_set(mEcoreWindow, KeyLookup::GetKeyName(key), 0, 0, 0, mode);
 }
 
-bool WindowBaseEcoreWl::UngrabKey( Dali::KEY key )
+bool WindowBaseEcoreWl::UngrabKey(Dali::KEY key)
 {
-  return ecore_wl_window_keygrab_unset( mEcoreWindow, KeyLookup::GetKeyName( key ), 0, 0 );
+  return ecore_wl_window_keygrab_unset(mEcoreWindow, KeyLookup::GetKeyName(key), 0, 0);
 }
 
-bool WindowBaseEcoreWl::GrabKeyList( const Dali::Vector< Dali::KEY >& key, const Dali::Vector< KeyGrab::KeyGrabMode >& grabMode, Dali::Vector< bool >& result )
+bool WindowBaseEcoreWl::GrabKeyList(const Dali::Vector<Dali::KEY>& key, const Dali::Vector<KeyGrab::KeyGrabMode>& grabMode, Dali::Vector<bool>& result)
 {
-  int keyCount = key.Count();
+  int keyCount         = key.Count();
   int keyGrabModeCount = grabMode.Count();
 
-  if( keyCount != keyGrabModeCount || keyCount == 0 )
+  if(keyCount != keyGrabModeCount || keyCount == 0)
   {
     return false;
   }
 
   eina_init();
 
-  Eina_List* keyList = NULL;
-  Ecore_Wl_Window_Keygrab_Info* info = new Ecore_Wl_Window_Keygrab_Info[keyCount];
+  Eina_List*                    keyList = NULL;
+  Ecore_Wl_Window_Keygrab_Info* info    = new Ecore_Wl_Window_Keygrab_Info[keyCount];
 
-  for( int index = 0; index < keyCount; ++index )
+  for(int index = 0; index < keyCount; ++index)
   {
-    info[index].key = const_cast< char* >( KeyLookup::GetKeyName( key[index] ) );
+    info[index].key = const_cast<char*>(KeyLookup::GetKeyName(key[index]));
 
-    switch( grabMode[index] )
+    switch(grabMode[index])
     {
       case KeyGrab::TOPMOST:
       {
@@ -1963,31 +1962,31 @@ bool WindowBaseEcoreWl::GrabKeyList( const Dali::Vector< Dali::KEY >& key, const
       }
     }
 
-    keyList = eina_list_append( keyList, &info );
+    keyList = eina_list_append(keyList, &info);
   }
 
-  Eina_List* grabList = ecore_wl_window_keygrab_list_set( mEcoreWindow, keyList );
+  Eina_List* grabList = ecore_wl_window_keygrab_list_set(mEcoreWindow, keyList);
 
-  result.Resize( keyCount, true );
+  result.Resize(keyCount, true);
 
-  Eina_List* l = NULL;
-  Eina_List* m = NULL;
-  void* listData = NULL;
-  void* data = NULL;
-  if( grabList != NULL )
+  Eina_List* l        = NULL;
+  Eina_List* m        = NULL;
+  void*      listData = NULL;
+  void*      data     = NULL;
+  if(grabList != NULL)
   {
-    EINA_LIST_FOREACH( grabList, m, data )
+    EINA_LIST_FOREACH(grabList, m, data)
     {
       int index = 0;
-      EINA_LIST_FOREACH( keyList, l, listData )
+      EINA_LIST_FOREACH(keyList, l, listData)
       {
-        if( static_cast< Ecore_Wl_Window_Keygrab_Info* >( listData )->key == NULL )
+        if(static_cast<Ecore_Wl_Window_Keygrab_Info*>(listData)->key == NULL)
         {
-          DALI_LOG_ERROR( "input key list has null data!" );
+          DALI_LOG_ERROR("input key list has null data!");
           break;
         }
 
-        if( strcmp( static_cast< char* >( data ), static_cast< Ecore_Wl_Window_Keygrab_Info* >( listData )->key ) == 0 )
+        if(strcmp(static_cast<char*>(data), static_cast<Ecore_Wl_Window_Keygrab_Info*>(listData)->key) == 0)
         {
           result[index] = false;
         }
@@ -1996,51 +1995,51 @@ bool WindowBaseEcoreWl::GrabKeyList( const Dali::Vector< Dali::KEY >& key, const
     }
   }
 
-  delete [] info;
+  delete[] info;
 
-  eina_list_free( keyList );
-  eina_list_free( grabList );
+  eina_list_free(keyList);
+  eina_list_free(grabList);
   eina_shutdown();
 
   return true;
 }
 
-bool WindowBaseEcoreWl::UngrabKeyList( const Dali::Vector< Dali::KEY >& key, Dali::Vector< bool >& result )
+bool WindowBaseEcoreWl::UngrabKeyList(const Dali::Vector<Dali::KEY>& key, Dali::Vector<bool>& result)
 {
   int keyCount = key.Count();
-  if( keyCount == 0 )
+  if(keyCount == 0)
   {
     return false;
   }
 
   eina_init();
 
-  Eina_List* keyList = NULL;
-  Ecore_Wl_Window_Keygrab_Info* info = new Ecore_Wl_Window_Keygrab_Info[keyCount];
+  Eina_List*                    keyList = NULL;
+  Ecore_Wl_Window_Keygrab_Info* info    = new Ecore_Wl_Window_Keygrab_Info[keyCount];
 
-  for( int index = 0; index < keyCount; ++index )
+  for(int index = 0; index < keyCount; ++index)
   {
-    info[index].key = const_cast< char* >( KeyLookup::GetKeyName( key[index] ) );
-    keyList = eina_list_append( keyList, &info );
+    info[index].key = const_cast<char*>(KeyLookup::GetKeyName(key[index]));
+    keyList         = eina_list_append(keyList, &info);
   }
 
-  Eina_List* ungrabList = ecore_wl_window_keygrab_list_unset( mEcoreWindow, keyList );
+  Eina_List* ungrabList = ecore_wl_window_keygrab_list_unset(mEcoreWindow, keyList);
 
-  result.Resize( keyCount, true );
+  result.Resize(keyCount, true);
 
-  Eina_List* l = NULL;
-  Eina_List* m = NULL;
-  void *listData = NULL;
-  void *data = NULL;
+  Eina_List* l        = NULL;
+  Eina_List* m        = NULL;
+  void*      listData = NULL;
+  void*      data     = NULL;
 
-  if( ungrabList != NULL )
+  if(ungrabList != NULL)
   {
-    EINA_LIST_FOREACH( ungrabList, m, data )
+    EINA_LIST_FOREACH(ungrabList, m, data)
     {
       int index = 0;
-      EINA_LIST_FOREACH( keyList, l, listData )
+      EINA_LIST_FOREACH(keyList, l, listData)
       {
-        if( strcmp( static_cast< char* >( data ), static_cast< Ecore_Wl_Window_Keygrab_Info* >( listData )->key ) == 0 )
+        if(strcmp(static_cast<char*>(data), static_cast<Ecore_Wl_Window_Keygrab_Info*>(listData)->key) == 0)
         {
           result[index] = false;
         }
@@ -2049,16 +2048,16 @@ bool WindowBaseEcoreWl::UngrabKeyList( const Dali::Vector< Dali::KEY >& key, Dal
     }
   }
 
-  delete [] info;
+  delete[] info;
 
-  eina_list_free( keyList );
-  eina_list_free( ungrabList );
+  eina_list_free(keyList);
+  eina_list_free(ungrabList);
   eina_shutdown();
 
   return true;
 }
 
-void WindowBaseEcoreWl::GetDpi( unsigned int& dpiHorizontal, unsigned int& dpiVertical )
+void WindowBaseEcoreWl::GetDpi(unsigned int& dpiHorizontal, unsigned int& dpiVertical)
 {
   // calculate DPI
   float xres, yres;
@@ -2067,102 +2066,119 @@ void WindowBaseEcoreWl::GetDpi( unsigned int& dpiHorizontal, unsigned int& dpiVe
   xres = ecore_wl_dpi_get();
   yres = ecore_wl_dpi_get();
 
-  dpiHorizontal = int( xres + 0.5f );  // rounding
-  dpiVertical   = int( yres + 0.5f );
+  dpiHorizontal = int(xres + 0.5f); // rounding
+  dpiVertical   = int(yres + 0.5f);
+}
+
+int WindowBaseEcoreWl::GetWindowRotationAngle() const
+{
+  int orientation = mWindowRotationAngle;
+  if(mSupportedPreProtation)
+  {
+    orientation = 0;
+  }
+  return orientation;
 }
 
 int WindowBaseEcoreWl::GetScreenRotationAngle()
 {
   int transform = 0;
 
-  if( ecore_wl_window_ignore_output_transform_get( mEcoreWindow ) )
+  if(ecore_wl_window_ignore_output_transform_get(mEcoreWindow))
   {
     transform = 0;
   }
   else
   {
-    transform = ecore_wl_output_transform_get( ecore_wl_window_output_find( mEcoreWindow ) );
+    transform = ecore_wl_output_transform_get(ecore_wl_window_output_find(mEcoreWindow));
   }
 
-  return transform * 90;
+  mScreenRotationAngle = transform * 90;
+  return mScreenRotationAngle;
 }
 
-void WindowBaseEcoreWl::SetWindowRotationAngle( int degree )
+void WindowBaseEcoreWl::SetWindowRotationAngle(int degree)
 {
-  ecore_wl_window_rotation_set( mEcoreWindow, degree );
+  mWindowRotationAngle = degree;
+  ecore_wl_window_rotation_set(mEcoreWindow, degree);
 }
 
-void WindowBaseEcoreWl::WindowRotationCompleted( int degree, int width, int height )
+void WindowBaseEcoreWl::WindowRotationCompleted(int degree, int width, int height)
 {
-  ecore_wl_window_rotation_change_done_send( mEcoreWindow );
+  ecore_wl_window_rotation_change_done_send(mEcoreWindow);
 }
 
-void WindowBaseEcoreWl::SetTransparency( bool transparent )
+void WindowBaseEcoreWl::SetTransparency(bool transparent)
 {
-  ecore_wl_window_alpha_set( mEcoreWindow, transparent );
+  ecore_wl_window_alpha_set(mEcoreWindow, transparent);
 }
 
-void WindowBaseEcoreWl::InitializeEcoreElDBus()
+void WindowBaseEcoreWl::CreateWindow(PositionSize positionSize)
 {
-#ifdef DALI_ELDBUS_AVAILABLE
-  Eldbus_Object* object;
-  Eldbus_Proxy* manager;
+  mEcoreWindow = ecore_wl_window_new(0, positionSize.x, positionSize.y, positionSize.width, positionSize.height, ECORE_WL_WINDOW_BUFFER_TYPE_EGL_WINDOW);
 
-  if( !( mSystemConnection = eldbus_connection_get( ELDBUS_CONNECTION_TYPE_SYSTEM ) ) )
+  if(mEcoreWindow == 0)
   {
-    DALI_LOG_ERROR( "Unable to get system bus\n" );
+    DALI_ASSERT_ALWAYS(0 && "Failed to create Wayland window");
   }
+}
 
-  object = eldbus_object_get( mSystemConnection, BUS, PATH );
-  if( !object )
+void WindowBaseEcoreWl::SetParent(WindowBase* parentWinBase, bool belowParent)
+{
+  Ecore_Wl_Window* ecoreParent = NULL;
+  if(parentWinBase)
   {
-    DALI_LOG_ERROR( "Getting object failed\n" );
-    return;
+    WindowBaseEcoreWl* winBaseEcore = static_cast<WindowBaseEcoreWl*>(parentWinBase);
+    ecoreParent                     = winBaseEcore->mEcoreWindow;
   }
+  ecore_wl_window_parent_set(mEcoreWindow, ecoreParent);
+}
 
-  manager = eldbus_proxy_get( object, INTERFACE );
-  if( !manager )
-  {
-    DALI_LOG_ERROR( "Getting proxy failed\n" );
-    return;
-  }
+int WindowBaseEcoreWl::CreateFrameRenderedSyncFence()
+{
+  return -1;
+}
 
-  if( !eldbus_proxy_signal_handler_add( manager, "GestureDetected", EcoreElDBusAccessibilityNotification, this ) )
-  {
-    DALI_LOG_ERROR( "No signal handler returned\n" );
-  }
-#endif
+int WindowBaseEcoreWl::CreateFramePresentedSyncFence()
+{
+  return -1;
 }
 
-void WindowBaseEcoreWl::CreateWindow( PositionSize positionSize )
+void WindowBaseEcoreWl::SetPositionSizeWithAngle(PositionSize positionSize, int angle)
 {
-  mEcoreWindow = ecore_wl_window_new( 0, positionSize.x, positionSize.y, positionSize.width, positionSize.height, ECORE_WL_WINDOW_BUFFER_TYPE_EGL_WINDOW );
+}
 
-  if ( mEcoreWindow == 0 )
-  {
-    DALI_ASSERT_ALWAYS( 0 && "Failed to create Wayland window" );
-  }
+void WindowBaseEcoreWl::InitializeIme()
+{
 }
 
-void WindowBaseEcoreWl::SetParent( WindowBase* parentWinBase )
+void WindowBaseEcoreWl::ImeWindowReadyToRender()
 {
-  Ecore_Wl_Window* ecoreParent = NULL;
-  if( parentWinBase )
-  {
-    WindowBaseEcoreWl* winBaseEcore = static_cast<WindowBaseEcoreWl*>( parentWinBase );
-    ecoreParent = winBaseEcore->mEcoreWindow;
-  }
-  ecore_wl_window_parent_set( mEcoreWindow, ecoreParent );
 }
 
-int WindowBaseEcoreWl::CreateFrameRenderedSyncFence()
+void WindowBaseEcoreWl::RequestMoveToServer()
 {
-  return -1;
 }
 
-int WindowBaseEcoreWl::CreateFramePresentedSyncFence()
+void WindowBaseEcoreWl::RequestResizeToServer(WindowResizeDirection direction)
+{
+}
+
+void WindowBaseEcoreWl::EnableFloatingMode(bool enable)
+{
+}
+
+bool WindowBaseEcoreWl::IsFloatingModeEnabled() const
+{
+  return false;
+}
+
+void WindowBaseEcoreWl::IncludeInputRegion(const Rect<int>& inputRegion)
+{
+}
+
+void WindowBaseEcoreWl::ExcludeInputRegion(const Rect<int>& inputRegion)
 {
-  return -1;
 }
 
 } // namespace Adaptor