Clean-up GlobalDAO (CookieSharingMode)

[Issue#]   LINUXWRT-1030
[Problem]  GlobalDAO has unnecessary API.
[Cause]    N/A
[Solution] Remove "CookieSharingMode" API
           - Share cookie between different application.
           - Feature requires by Web contents team to easily login both Gmail and other google service applications.
           - After Webkit supports "save submit form", requirement is unnecessary.
[Verification] Checking API usage
               - No usage
[SCMRequest] N/A

Change-Id: I33eea12e3d63009fdbe4791fadd27efcb9e53a4d

diff --git a/modules/widget_dao/dao/global_dao.cpp b/modules/widget_dao/dao/global_dao.cpp
index ff82212..20b4596 100644 (file)
--- a/modules/widget_dao/dao/global_dao.cpp
+++ b/modules/widget_dao/dao/global_dao.cpp
@@ -48,22 +48,4 @@ void GlobalDAO::SetRoamingDataUsage(GlobalDAO::NetworkAccessMode newMode)
     }
 }
 
-void GlobalDAO::SetCookieSharingMode(bool mode)
-{
-    LogDebug("updating Cookie Sharing mode to:" << mode);
-    Try {
-        using namespace DPL::DB::ORM;
-        using namespace DPL::DB::ORM::wrt;
-        GlobalProperties::Row row;
-        row.Set_cookie_sharing_mode(mode);
-
-        WRT_DB_UPDATE(update, GlobalProperties, &WrtDatabase::interface())
-        update->Values(row);
-        update->Execute();
-    }
-    Catch(DPL::DB::SqlConnection::Exception::Base){
-        ReThrowMsg(GlobalDAO::Exception::DatabaseError,
-                   "Failed to update Cookie Sharing Mode");
-    }
-}
 } // namespace WrtDB

diff --git a/modules/widget_dao/dao/global_dao_read_only.cpp b/modules/widget_dao/dao/global_dao_read_only.cpp
index cb6c9fb..2520181 100644 (file)
--- a/modules/widget_dao/dao/global_dao_read_only.cpp
+++ b/modules/widget_dao/dao/global_dao_read_only.cpp
@@ -91,18 +91,4 @@ DeviceCapabilitySet GlobalDAOReadOnly::GetDeviceCapability(
     }
 }
 
-bool GlobalDAOReadOnly::GetCookieSharingMode()
-{
-    LogDebug("Getting Cookie Sharing mode");
-    Try {
-        using namespace DPL::DB::ORM;
-        using namespace DPL::DB::ORM::wrt;
-        WRT_DB_SELECT(select, GlobalProperties, &WrtDatabase::interface())
-        return select->GetSingleValue<GlobalProperties::cookie_sharing_mode>();
-    }
-    Catch(DPL::DB::SqlConnection::Exception::Base){
-        ReThrowMsg(GlobalDAOReadOnly::Exception::DatabaseError,
-                   "Failed to get Cookie Sharing mode");
-    }
-}
 } // namespace WrtDB

diff --git a/modules/widget_dao/include/dpl/wrt-dao-ro/global_dao_read_only.h b/modules/widget_dao/include/dpl/wrt-dao-ro/global_dao_read_only.h
index eee3870..d60a8a8 100644 (file)
--- a/modules/widget_dao/include/dpl/wrt-dao-ro/global_dao_read_only.h
+++ b/modules/widget_dao/include/dpl/wrt-dao-ro/global_dao_read_only.h
@@ -53,7 +53,6 @@ class GlobalDAOReadOnly
   public:
 
 
-    static bool GetCookieSharingMode() DPL_DEPRECATED;
 
     enum NetworkAccessMode
     {

diff --git a/modules/widget_dao/include/dpl/wrt-dao-rw/global_dao.h b/modules/widget_dao/include/dpl/wrt-dao-rw/global_dao.h
index fb0923e..aa150c4 100644 (file)
--- a/modules/widget_dao/include/dpl/wrt-dao-rw/global_dao.h
+++ b/modules/widget_dao/include/dpl/wrt-dao-rw/global_dao.h
@@ -36,8 +36,6 @@ class GlobalDAO : public GlobalDAOReadOnly
      */
     static void SetRoamingDataUsage(NetworkAccessMode newMode) DPL_DEPRECATED;
 
-    static void SetCookieSharingMode(bool mode) DPL_DEPRECATED;
-
   private:
     DPL_DEPRECATED GlobalDAO()
     {}

diff --git a/modules/widget_dao/orm/wrt_db b/modules/widget_dao/orm/wrt_db
index e76a48a..ce6c101 100644 (file)
--- a/modules/widget_dao/orm/wrt_db
+++ b/modules/widget_dao/orm/wrt_db
@@ -4,7 +4,6 @@ SQL(
 )
 CREATE_TABLE(GlobalProperties)
     COLUMN_NOT_NULL(roaming_data_usage,      TINYINT,      DEFAULT 1)
-    COLUMN_NOT_NULL(cookie_sharing_mode,          INT,          DEFAULT 0)
 CREATE_TABLE_END()
 
 SQL(