X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fdomain%2Fwidget_model.h;h=6c2d6c412dee72626c8ed56fd6ec02f5548886ed;hb=41bf8466c30357c336a459b9dc6b8ed40092f701;hp=496383d62a489f32a2135736b60f20112b583def;hpb=d911ebbf6da788283f3631a712dc8bb934c468fa;p=platform%2Fframework%2Fweb%2Fwrt.git

diff --git a/src/domain/widget_model.h b/src/domain/widget_model.h
index 496383d..6c2d6c4 100644
--- a/src/domain/widget_model.h
+++ b/src/domain/widget_model.h
@@ -25,6 +25,7 @@
 #include <dpl/event/model.h>
 #include <dpl/event/property.h>
 #include <dpl/optional.h>
+#include <dpl/optional_typedefs.h>
 #include <string>
 
 #include "widget_data_types.h"
@@ -130,16 +131,14 @@ class WidgetModel : public DPL::Event::Model
      *
      * Gets path in which widget may store its persistent private data.
      */
-    DPL::Event::Property<DPL::String,
-                         DPL::Event::PropertyReadOnly> PersistentStoragePath;
+    DPL::Event::Property<DPL::String> PersistentStoragePath;
 
     /**
      * @brief Path to widget's temporary storage.
      *
      * Gets path in which widget may store its temporary private data.
      */
-    DPL::Event::Property<DPL::String,
-                         DPL::Event::PropertyReadOnly> TemporaryStoragePath;
+    DPL::Event::Property<DPL::String> TemporaryStoragePath;
 
     /**
      * @brief Widget defaultlocale
@@ -217,26 +216,34 @@ class WidgetModel : public DPL::Event::Model
      */
     DPL::Event::Property<WidgetAccessList> AccessList;
 
-    /**
-     * @brief Is this DeveloperWidget
-     */
-    DPL::Event::Property<bool,
-                         DPL::Event::PropertyReadOnly,
-                         DPL::Event::PropertyStorageDynamicCached> IsTestWidget;
-
     DPL::Event::Property<WidgetSettingList> SettingList;
 
     /**
-     * @brief Widget Application Service list
+     * @brief Widget app-control list
      */
-    DPL::Event::Property<WidgetApplicationServiceList> AppServiceList;
+    DPL::Event::Property<WrtDB::WidgetAppControlList> AppControlList;
+    DPL::Event::Property<DPL::OptionalUInt> AppControlIndex;
+
+    DPL::Event::Property<WrtDB::WidgetSecurityModelVersion,
+                         DPL::Event::PropertyReadOnly,
+                         DPL::Event::PropertyStorageDynamicCached> SecurityModelVersion;
+
+    DPL::Event::Property<WrtDB::SettingsType,
+                         DPL::Event::PropertyReadOnly,
+                         DPL::Event::PropertyStorageDynamicCached> SecurePopupUsage;
+    DPL::Event::Property<WrtDB::SettingsType,
+                         DPL::Event::PropertyReadOnly,
+                         DPL::Event::PropertyStorageDynamicCached> GeolocationUsage;
+    DPL::Event::Property<WrtDB::SettingsType,
+                         DPL::Event::PropertyReadOnly,
+                         DPL::Event::PropertyStorageDynamicCached> WebNotificationUsage;
+    DPL::Event::Property<WrtDB::SettingsType,
+                         DPL::Event::PropertyReadOnly,
+                         DPL::Event::PropertyStorageDynamicCached> WebStorageUsage;
 
     WidgetModel(const std::string &tizenId);
 
   private:
-    // Custom read write delegates
-    static DPL::String           getTimestamp();
-
     DPL::String getTizenId() const;
 };