[Title] removing remember form and remember password setting menu

[Issue#] N/A
[Problem] There are setting items which is not implemented.
[Cause] the features isn't implemented.
[Solution] menus are removed.
[Team] Browser UI
[Developer] sangpyo7.kim
[Request] N/A

Change-Id: I6b8e607a4b7094cd4519b366442d3156eb68b7ae

diff --git a/src/browser-main.cpp b/src/browser-main.cpp
index 18ebd81..e4bc7e1 100755 (executable)
--- a/src/browser-main.cpp
+++ b/src/browser-main.cpp
@@ -100,10 +100,6 @@ static bool __init_preference()
                return false;
        if (!br_preference_create_bool(ACCEPT_COOKIES_KEY, true))
                return false;
-       if (!br_preference_create_bool(AUTO_SAVE_ID_PASSWORD_KEY, false))
-               return false;
-       if (!br_preference_create_bool(AUTO_SAVE_FORM_DATA_KEY, false))
-               return false;
        if (!br_preference_create_bool(ENABLE_LOCATION_KEY, true))
                return false;
 #ifdef ZOOM_BUTTON

diff --git a/src/browser-settings/browser-settings-main-view.cpp b/src/browser-settings/browser-settings-main-view.cpp
index 604fb57..a00b499 100755 (executable)
--- a/src/browser-settings/browser-settings-main-view.cpp
+++ b/src/browser-settings/browser-settings-main-view.cpp
@@ -49,9 +49,6 @@ Browser_Settings_Main_View::Browser_Settings_Main_View(void)
        ,m_navi_it(NULL)\r
        ,m_show_security_warnings_check(NULL)\r
        ,m_clear_all_cookies_data_confirm_popup(NULL)\r
-       ,m_auto_save_id_pass_check(NULL)\r
-       ,m_clear_passwords_confirm_popup(NULL)\r
-       ,m_clear_form_data_confirm_popup(NULL)\r
        ,m_website_setting(NULL)\r
        ,m_user_agent_view(NULL)\r
 {\r
@@ -391,36 +388,6 @@ Evas_Object *Browser_Settings_Main_View::__genlist_icon_get(void *data, Evas_Obj
                        }\r
                        return main_view->m_show_security_warnings_check;\r
                }\r
-       } else if (type == BR_PRIVACY_MENU_REMEMBER_FORM_DATA) {\r
-               if (!strncmp(part, "elm.icon", strlen("elm.icon"))) {\r
-                       main_view->m_auto_save_form_data_check = elm_check_add(obj);\r
-                       if (main_view->m_auto_save_form_data_check) {\r
-                               elm_object_style_set(main_view->m_auto_save_form_data_check, "on&off");\r
-                               evas_object_smart_callback_add(main_view->m_auto_save_form_data_check, "changed",\r
-                                               __auto_save_form_data_check_changed_cb, main_view->m_auto_save_form_data_check);\r
-\r
-                               bool auto_save_form = false;\r
-                               br_preference_get_bool(AUTO_SAVE_FORM_DATA_KEY, &auto_save_form);\r
-                               elm_check_state_set(main_view->m_auto_save_form_data_check, auto_save_form);\r
-                               evas_object_propagate_events_set(main_view->m_auto_save_form_data_check, EINA_FALSE);\r
-                       }\r
-                       return main_view->m_auto_save_form_data_check;\r
-               }\r
-       } else if (type == BR_PRIVACY_MENU_REMEMBER_PASSWORDS) {\r
-               if (!strncmp(part, "elm.icon", strlen("elm.icon"))) {\r
-                       main_view->m_auto_save_id_pass_check = elm_check_add(obj);\r
-                       if (main_view->m_auto_save_id_pass_check) {\r
-                               elm_object_style_set(main_view->m_auto_save_id_pass_check, "on&off");\r
-                               evas_object_smart_callback_add(main_view->m_auto_save_id_pass_check, "changed",\r
-                                               __auto_save_id_pass_check_changed_cb, main_view->m_auto_save_id_pass_check);\r
-\r
-                               bool auto_save = false;\r
-                               br_preference_get_bool(AUTO_SAVE_ID_PASSWORD_KEY, &auto_save);\r
-                               elm_check_state_set(main_view->m_auto_save_id_pass_check, auto_save);\r
-                               evas_object_propagate_events_set(main_view->m_auto_save_id_pass_check, EINA_FALSE);\r
-                       }\r
-                       return main_view->m_auto_save_id_pass_check;\r
-               }\r
        } else if (type == BR_PRIVACY_MENU_ACCEPT_COOKIES) {\r
                if (!strncmp(part, "elm.icon", strlen("elm.icon"))) {\r
                        main_view->m_accept_cookies_check = elm_check_add(obj);\r
@@ -451,50 +418,7 @@ Evas_Object *Browser_Settings_Main_View::__genlist_icon_get(void *data, Evas_Obj
                        }\r
                        return main_view->m_enable_location_check;\r
                }\r
-       } else if (type == BR_PRIVACY_SUBMENU_ALWAYS_ASK\r
-           || type == BR_PRIVACY_SUBMENU_ALWAYS_ON\r
-           || type == BR_PRIVACY_SUBMENU_ALWAYS_OFF) {\r
-               if (!strncmp(part, "elm.icon", strlen("elm.icon"))) {\r
-                       Evas_Object *radio_button = elm_radio_add(obj);\r
-                       if (radio_button) {\r
-                               if (type == BR_PRIVACY_SUBMENU_ALWAYS_ASK)\r
-                                       elm_radio_state_value_set(radio_button, 0);\r
-                               else if (type == BR_PRIVACY_SUBMENU_ALWAYS_ON)\r
-                                       elm_radio_state_value_set(radio_button, 1);\r
-                               else if (type == BR_PRIVACY_SUBMENU_ALWAYS_OFF)\r
-                                       elm_radio_state_value_set(radio_button, 2);\r
-\r
-                               elm_radio_group_add(radio_button, main_view->m_auto_save_id_pass_radio_group);\r
-\r
-                               char* auto_save = NULL;\r
-                               if (br_preference_get_str(AUTO_SAVE_ID_PASSWORD_KEY, &auto_save) == false) {\r
-                                       BROWSER_LOGE("failed to get %s preference\n", AUTO_SAVE_ID_PASSWORD_KEY);\r
-                                       return NULL;\r
-                               }\r
-                               if (!auto_save) {\r
-                                       br_preference_set_str(AUTO_SAVE_ID_PASSWORD_KEY, ALWAYS_ASK);\r
-                                       auto_save = strdup(ALWAYS_ASK);\r
-                               }\r
-\r
-                               if (!auto_save) {\r
-                                       BROWSER_LOGE("strdup failed");\r
-                                       return NULL;\r
-                               }\r
-\r
-                               if (!strncmp(auto_save, ALWAYS_ASK, strlen(ALWAYS_ASK)))\r
-                                       elm_radio_value_set(main_view->m_auto_save_id_pass_radio_group, 0);\r
-                               else if (!strncmp(auto_save, ALWAYS_ON, strlen(ALWAYS_ON)))\r
-                                       elm_radio_value_set(main_view->m_auto_save_id_pass_radio_group, 1);\r
-                               else\r
-                                       elm_radio_value_set(main_view->m_homepage_radio_group, 2);\r
-\r
-                               free(auto_save);\r
-                       }\r
-\r
-                       return radio_button;\r
-               }\r
        }\r
-\r
        return NULL;\r
 }\r
 \r
@@ -534,24 +458,6 @@ void Browser_Settings_Main_View::__show_security_warnings_check_changed_cb(void
        br_preference_set_bool(key, state);\r
 }\r
 \r
-void Browser_Settings_Main_View::__auto_save_form_data_check_changed_cb(void *data,\r
-                                                       Evas_Object *obj, void *event_info)\r
-{\r
-       BROWSER_LOGD("[%s]", __func__);\r
-       const char *key = AUTO_SAVE_FORM_DATA_KEY;\r
-       Eina_Bool state = elm_check_state_get((Evas_Object*)data);\r
-       br_preference_set_bool(key, state);\r
-}\r
-\r
-void Browser_Settings_Main_View::__auto_save_id_pass_check_changed_cb(void *data,\r
-                                                       Evas_Object *obj, void *event_info)\r
-{\r
-       BROWSER_LOGD("[%s]", __func__);\r
-       const char *key = AUTO_SAVE_ID_PASSWORD_KEY;\r
-       Eina_Bool state = elm_check_state_get((Evas_Object*)data);\r
-       br_preference_set_bool(key, state);\r
-}\r
-\r
 void Browser_Settings_Main_View::__accept_cookies_check_changed_cb(void *data,\r
                                                        Evas_Object *obj, void *event_info)\r
 {\r
@@ -709,21 +615,6 @@ char *Browser_Settings_Main_View::__genlist_label_get(void *data, Evas_Object *o
                        return strdup(BR_STRING_COOKIES);\r
                else if (!strncmp(part, "elm.text.1", strlen("elm.text.1")))\r
                        return strdup(BR_STRING_CLEAR_ALL_COOKIE_DATA);\r
-       } else if (type == BR_PRIVACY_MENU_REMEMBER_FORM_DATA) {\r
-               if (!strncmp(part, "elm.text.2", strlen("elm.text.2")))\r
-                       return strdup(BR_STRING_FORMDATA);\r
-               else if (!strncmp(part, "elm.text.1", strlen("elm.text.1")))\r
-                       return strdup(BR_STRING_REMEMBER_FORMDATA);\r
-       } else if (type == BR_PRIVACY_CLEAR_FORM_DATA) {\r
-               if (!strncmp(part, "elm.text.2", strlen("elm.text.2")))\r
-                       return strdup(BR_STRING_FORMDATA);\r
-               else if (!strncmp(part, "elm.text.1", strlen("elm.text.1")))\r
-                       return strdup(BR_STRING_CLEAR_FORMDATA);\r
-       } else if (type == BR_PRIVACY_MENU_REMEMBER_PASSWORDS) {\r
-               if (!strncmp(part, "elm.text.2", strlen("elm.text.2")))\r
-                       return strdup(BR_STRING_PASSWORDS);\r
-               else if (!strncmp(part, "elm.text.1", strlen("elm.text.1")))\r
-                       return strdup(BR_STRING_REMEMBER_PASSWORDS);\r
        } else if (type == BR_PRIVACY_SUBMENU_ALWAYS_ASK) {\r
                if (!strncmp(part, "elm.text", strlen("elm.text")))\r
                        return strdup(BR_STRING_ALWAYS_ASK);\r
@@ -746,11 +637,6 @@ char *Browser_Settings_Main_View::__genlist_label_get(void *data, Evas_Object *o
                        return strdup(BR_STRING_LOCATION);\r
                else if (!strncmp(part, "elm.text.1", strlen("elm.text.1")))\r
                        return strdup(BR_STRING_CLEAR_LOCATION_ACCESS);\r
-       } else if (type == BR_PRIVACY_CLEAR_PASSWORDS) {\r
-               if (!strncmp(part, "elm.text.2", strlen("elm.text.2")))\r
-                       return strdup(BR_STRING_PASSWORDS);\r
-               else if (!strncmp(part, "elm.text.1", strlen("elm.text.1")))\r
-                       return strdup(BR_STRING_CLEAR_PASSWORDS);\r
        } else if (type == BR_PRIVACY_WEBSITE_SETTING) {\r
                if (!strncmp(part, "elm.text", strlen("elm.text")))\r
                        return strdup(BR_STRING_WEBSITE_SETTINGS);\r
@@ -859,39 +745,6 @@ void Browser_Settings_Main_View::__default_view_level_sub_item_clicked_cb(void *
        elm_genlist_item_selected_set(callback_data->it, EINA_FALSE);\r
 }\r
 \r
-void Browser_Settings_Main_View::__auto_save_id_pass_sub_item_clicked_cb(void *data,\r
-                                                       Evas_Object *obj, void *event_info)\r
-{\r
-       BROWSER_LOGD("[%s]", __func__);\r
-       if (!data)\r
-               return;\r
-       genlist_callback_data *callback_data = (genlist_callback_data *)data;\r
-       Browser_Settings_Main_View::menu_type type = callback_data->type;\r
-       Browser_Settings_Main_View *main_view = (Browser_Settings_Main_View *)(callback_data->user_data);\r
-\r
-       int radio_value = 0;\r
-       if (type == BR_PRIVACY_SUBMENU_ALWAYS_ASK)\r
-               radio_value = 0;\r
-       else if (type == BR_PRIVACY_SUBMENU_ALWAYS_ON)\r
-               radio_value = 1;\r
-       else if (type == BR_PRIVACY_SUBMENU_ALWAYS_OFF)\r
-               radio_value = 2;\r
-\r
-       if (elm_radio_value_get(main_view->m_auto_save_id_pass_radio_group) != radio_value) {\r
-               elm_radio_value_set(main_view->m_auto_save_id_pass_radio_group, radio_value);\r
-               if (radio_value == 0)\r
-                       br_preference_set_str(AUTO_SAVE_ID_PASSWORD_KEY, ALWAYS_ASK);\r
-               else if (radio_value == 1)\r
-                       br_preference_set_str(AUTO_SAVE_ID_PASSWORD_KEY, ALWAYS_ON);\r
-               else if (radio_value == 2)\r
-                       br_preference_set_str(AUTO_SAVE_ID_PASSWORD_KEY, ALWAYS_OFF);\r
-\r
-               elm_genlist_item_update(main_view->m_auto_save_item_callback_data.it);\r
-       }\r
-\r
-       elm_genlist_item_selected_set(callback_data->it, EINA_FALSE);\r
-}\r
-\r
 void Browser_Settings_Main_View::__expandable_icon_clicked_cb(void *data, Evas_Object *obj,\r
                                                                                void *event_info)\r
 {\r
@@ -970,28 +823,6 @@ void Browser_Settings_Main_View::__expandable_icon_clicked_cb(void *data, Evas_O
                                                                                &(main_view->m_readable_item_callback_data), it,\r
                                                                                ELM_GENLIST_ITEM_NONE, __default_view_level_sub_item_clicked_cb,\r
                                                                                &(main_view->m_readable_item_callback_data));\r
-               } else if (it == main_view->m_auto_save_item_callback_data.it) {\r
-                       BROWSER_LOGD("__expandable_icon_clicked_cb - autosave");\r
-                       main_view->m_auto_save_always_ask_item_callback_data.type = BR_PRIVACY_SUBMENU_ALWAYS_ASK;\r
-                       main_view->m_auto_save_always_ask_item_callback_data.user_data = main_view;\r
-                       main_view->m_auto_save_always_ask_item_callback_data.it = elm_genlist_item_append(genlist, &(main_view->m_radio_text_item_class),\r
-                                                                               &(main_view->m_auto_save_always_ask_item_callback_data), it,\r
-                                                                               ELM_GENLIST_ITEM_NONE, __auto_save_id_pass_sub_item_clicked_cb,\r
-                                                                               &(main_view->m_auto_save_always_ask_item_callback_data));\r
-\r
-                       main_view->m_auto_save_always_on_item_callback_data.type = BR_PRIVACY_SUBMENU_ALWAYS_ON;\r
-                       main_view->m_auto_save_always_on_item_callback_data.user_data = main_view;\r
-                       main_view->m_auto_save_always_on_item_callback_data.it = elm_genlist_item_append(genlist, &(main_view->m_radio_text_item_class),\r
-                                                                               &(main_view->m_auto_save_always_on_item_callback_data), it,\r
-                                                                               ELM_GENLIST_ITEM_NONE, __auto_save_id_pass_sub_item_clicked_cb,\r
-                                                                               &(main_view->m_auto_save_always_on_item_callback_data));\r
-\r
-                       main_view->m_auto_save_always_off_item_callback_data.type = BR_PRIVACY_SUBMENU_ALWAYS_OFF;\r
-                       main_view->m_auto_save_always_off_item_callback_data.user_data = main_view;\r
-                       main_view->m_auto_save_always_off_item_callback_data.it = elm_genlist_item_append(genlist, &(main_view->m_radio_text_item_class),\r
-                                                                               &(main_view->m_auto_save_always_off_item_callback_data), it,\r
-                                                                               ELM_GENLIST_ITEM_NONE, __auto_save_id_pass_sub_item_clicked_cb,\r
-                                                                               &(main_view->m_auto_save_always_off_item_callback_data));\r
                }\r
        }\r
 \r
@@ -1026,14 +857,6 @@ void Browser_Settings_Main_View::__on_off_check_clicked_cb(void *data, Evas_Obje
                state = elm_check_state_get(main_view->m_show_security_warnings_check);\r
                elm_check_state_set(main_view->m_show_security_warnings_check, !state);\r
                __show_security_warnings_check_changed_cb(main_view->m_show_security_warnings_check, NULL, NULL);\r
-       } else if (type == BR_PRIVACY_MENU_REMEMBER_FORM_DATA) {\r
-               state = elm_check_state_get(main_view->m_auto_save_form_data_check);\r
-               elm_check_state_set(main_view->m_auto_save_form_data_check, !state);\r
-               __auto_save_form_data_check_changed_cb(main_view->m_auto_save_form_data_check, NULL, NULL);\r
-       }else if (type == BR_PRIVACY_MENU_REMEMBER_PASSWORDS) {\r
-               state = elm_check_state_get(main_view->m_auto_save_id_pass_check);\r
-               elm_check_state_set(main_view->m_auto_save_id_pass_check, !state);\r
-               __auto_save_id_pass_check_changed_cb(main_view->m_auto_save_id_pass_check, NULL, NULL);\r
        } else if (type == BR_PRIVACY_MENU_ACCEPT_COOKIES) {\r
                state = elm_check_state_get(main_view->m_accept_cookies_check);\r
                elm_check_state_set(main_view->m_accept_cookies_check, !state);\r
@@ -1094,10 +917,6 @@ void Browser_Settings_Main_View::__genlist_item_clicked_cb(void *data, Evas_Obje
                main_view->_show_clear_history_confirm_popup();\r
        } else if (type == BR_PRIVATE_MENU_CLEAR_ALL_COOKIE_DATA) {\r
                main_view->_show_clear_all_cookie_data_confirm_popup();\r
-       } else if (type == BR_PRIVACY_CLEAR_FORM_DATA) {\r
-               main_view->_show_clear_form_data_confirm_popup();\r
-       } else if (type == BR_PRIVACY_CLEAR_PASSWORDS) {\r
-               main_view->_show_clear_passwords_confirm_popup();\r
        } else if (type == BR_PRIVACY_WEBSITE_SETTING) {\r
                BROWSER_LOGD("Web sites setting");\r
                if (main_view->m_website_setting)\r
@@ -1140,7 +959,6 @@ void Browser_Settings_Main_View::_reset_settings(void)
        br_preference_set_bool(BLOCK_POPUP_KEY, true);\r
        br_preference_set_bool(SHOW_SECURITY_WARNINGS_KEY, true);\r
        br_preference_set_bool(ACCEPT_COOKIES_KEY, true);\r
-       br_preference_set_bool(AUTO_SAVE_ID_PASSWORD_KEY, false);\r
        if (vconf_set_int(VCONFKEY_SETAPPL_DEFAULT_MEM_WAP_INT, SETTING_DEF_MEMORY_PHONE) < 0)\r
                BROWSER_LOGE("vconf_set_int(VCONFKEY_SETAPPL_DEFAULT_MEM_WAP_INT, SETTING_DEF_MEMORY_PHONE) failed");\r
        if (vconf_set_str(USERAGENT_KEY, DEFAULT_USER_AGENT_STRING) < 0)\r
@@ -1419,133 +1237,6 @@ Eina_Bool Browser_Settings_Main_View::_show_clear_all_cookie_data_confirm_popup(
        return EINA_TRUE;\r
 }\r
 \r
-void Browser_Settings_Main_View::__clear_passwords_confirm_response_cb(void *data, Evas_Object *obj, void *event_info)\r
-{\r
-       BROWSER_LOGD("[%s]", __func__);\r
-       if (!data)\r
-               return;\r
-\r
-       Browser_Settings_Main_View *main_view = (Browser_Settings_Main_View *)data;\r
-       if (main_view->m_clear_passwords_confirm_popup) {\r
-               evas_object_del(main_view->m_clear_passwords_confirm_popup);\r
-               main_view->m_clear_passwords_confirm_popup = NULL;\r
-       }\r
-\r
-       main_view->show_notify_popup(BR_STRING_DELETED, 3, EINA_TRUE);\r
-}\r
-\r
-void Browser_Settings_Main_View::__cancel_clear_passwords_confirm_response_cb(void *data, Evas_Object *obj, void *event_info)\r
-{\r
-       BROWSER_LOGD("[%s]", __func__);\r
-       if (!data)\r
-               return;\r
-\r
-       Browser_Settings_Main_View *main_view = (Browser_Settings_Main_View *)data;\r
-       if (main_view->m_clear_passwords_confirm_popup) {\r
-               evas_object_del(main_view->m_clear_passwords_confirm_popup);\r
-               main_view->m_clear_passwords_confirm_popup = NULL;\r
-       }\r
-}\r
-\r
-void Browser_Settings_Main_View::__clear_form_data_confirm_response_cb(void *data, Evas_Object *obj, void *event_info)\r
-{\r
-       BROWSER_LOGD("[%s]", __func__);\r
-       if (!data)\r
-               return;\r
-\r
-       Browser_Settings_Main_View *main_view = (Browser_Settings_Main_View *)data;\r
-       if (main_view->m_clear_form_data_confirm_popup) {\r
-               evas_object_del(main_view->m_clear_form_data_confirm_popup);\r
-               main_view->m_clear_form_data_confirm_popup = NULL;\r
-       }\r
-\r
-       main_view->show_notify_popup(BR_STRING_DELETED, 3, EINA_TRUE);\r
-}\r
-\r
-void Browser_Settings_Main_View::__cancel_clear_form_data_confirm_response_cb(void *data, Evas_Object *obj, void *event_info)\r
-{\r
-       BROWSER_LOGD("[%s]", __func__);\r
-       if (!data)\r
-               return;\r
-\r
-       Browser_Settings_Main_View *main_view = (Browser_Settings_Main_View *)data;\r
-       if (main_view->m_clear_form_data_confirm_popup) {\r
-               evas_object_del(main_view->m_clear_form_data_confirm_popup);\r
-               main_view->m_clear_form_data_confirm_popup = NULL;\r
-       }\r
-}\r
-Eina_Bool Browser_Settings_Main_View::_show_clear_passwords_confirm_popup(void)\r
-{\r
-       BROWSER_LOGD("[%s]", __func__);\r
-       if (m_clear_passwords_confirm_popup)\r
-               evas_object_del(m_clear_passwords_confirm_popup);\r
-\r
-       m_clear_passwords_confirm_popup = elm_popup_add(m_genlist);\r
-       if (!m_clear_passwords_confirm_popup) {\r
-               BROWSER_LOGE("elm_popup_add failed");\r
-               return EINA_FALSE;\r
-       }\r
-\r
-       evas_object_size_hint_weight_set(m_clear_passwords_confirm_popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);\r
-\r
-       std::string confirm_msg = std::string(BR_STRING_CLEAR_ALL_SAVED_PASSWORDS_Q);\r
-       elm_object_text_set(m_clear_passwords_confirm_popup, confirm_msg.c_str());\r
-\r
-       Evas_Object *ok_button = elm_button_add(m_clear_passwords_confirm_popup);\r
-       if (!ok_button) {\r
-               BROWSER_LOGE("elm_button_add failed");\r
-               return EINA_FALSE;\r
-       }\r
-       elm_object_text_set(ok_button, BR_STRING_YES);\r
-       elm_object_part_content_set(m_clear_passwords_confirm_popup, "button1", ok_button);\r
-       evas_object_smart_callback_add(ok_button, "clicked", __clear_passwords_confirm_response_cb, this);\r
-\r
-       Evas_Object *cancel_button = elm_button_add(m_clear_passwords_confirm_popup);\r
-       elm_object_text_set(cancel_button, BR_STRING_NO);\r
-       elm_object_part_content_set(m_clear_passwords_confirm_popup, "button2", cancel_button);\r
-       evas_object_smart_callback_add(cancel_button, "clicked", __cancel_clear_passwords_confirm_response_cb, this);\r
-\r
-       evas_object_show(m_clear_passwords_confirm_popup);\r
-\r
-       return EINA_TRUE;\r
-}\r
-\r
-Eina_Bool Browser_Settings_Main_View::_show_clear_form_data_confirm_popup(void)\r
-{\r
-       BROWSER_LOGD("[%s]", __func__);\r
-       if (m_clear_form_data_confirm_popup)\r
-               evas_object_del(m_clear_form_data_confirm_popup);\r
-\r
-       m_clear_form_data_confirm_popup = elm_popup_add(m_genlist);\r
-       if (!m_clear_form_data_confirm_popup) {\r
-               BROWSER_LOGE("elm_popup_add failed");\r
-               return EINA_FALSE;\r
-       }\r
-\r
-       evas_object_size_hint_weight_set(m_clear_form_data_confirm_popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);\r
-\r
-       std::string confirm_msg = std::string(BR_STRING_CLEAR_ALL_FORMDATA_Q);\r
-       elm_object_text_set(m_clear_form_data_confirm_popup, confirm_msg.c_str());\r
-\r
-       Evas_Object *ok_button = elm_button_add(m_clear_form_data_confirm_popup);\r
-       if (!ok_button) {\r
-               BROWSER_LOGE("elm_button_add failed");\r
-               return EINA_FALSE;\r
-       }\r
-       elm_object_text_set(ok_button, BR_STRING_YES);\r
-       elm_object_part_content_set(m_clear_form_data_confirm_popup, "button1", ok_button);\r
-       evas_object_smart_callback_add(ok_button, "clicked", __clear_form_data_confirm_response_cb, this);\r
-\r
-       Evas_Object *cancel_button = elm_button_add(m_clear_form_data_confirm_popup);\r
-       elm_object_text_set(cancel_button, BR_STRING_NO);\r
-       elm_object_part_content_set(m_clear_form_data_confirm_popup, "button2", cancel_button);\r
-       evas_object_smart_callback_add(cancel_button, "clicked", __cancel_clear_form_data_confirm_response_cb, this);\r
-\r
-       evas_object_show(m_clear_form_data_confirm_popup);\r
-\r
-       return EINA_TRUE;\r
-}\r
-\r
 void Browser_Settings_Main_View::__clear_location_confirm_response_cb(void *data, Evas_Object *obj, void *event_info)\r
 {\r
        BROWSER_LOGD("[%s]", __func__);\r
@@ -1755,18 +1446,6 @@ Evas_Object *Browser_Settings_Main_View::_create_content_genlist(void)
        m_1_text_item_class.func.state_get = NULL;\r
        m_1_text_item_class.func.del = NULL;\r
 \r
-       m_auto_save_form_data_callback_data.type = BR_PRIVACY_MENU_REMEMBER_FORM_DATA;\r
-       m_auto_save_form_data_callback_data.user_data = this;\r
-       m_auto_save_form_data_callback_data.it = elm_genlist_item_append(genlist, &m_2_text_1_icon_item_class,\r
-                                                       &m_auto_save_form_data_callback_data, NULL, ELM_GENLIST_ITEM_NONE,\r
-                                                       __on_off_check_clicked_cb, &m_auto_save_form_data_callback_data);\r
-\r
-       m_clear_form_data_callback_data.type = BR_PRIVACY_CLEAR_FORM_DATA;\r
-       m_clear_form_data_callback_data.user_data = this;\r
-       m_clear_form_data_callback_data.it = elm_genlist_item_append(genlist, &m_2_text_3_item_class,\r
-                                                       &m_clear_form_data_callback_data, NULL, ELM_GENLIST_ITEM_NONE,\r
-                                                       __genlist_item_clicked_cb, &m_clear_form_data_callback_data);\r
-\r
        m_enable_location_callback_data.type = BR_PRIVACY_MENU_ENABLE_LOCATION;\r
        m_enable_location_callback_data.user_data = this;\r
        m_enable_location_callback_data.it = elm_genlist_item_append(genlist, &m_2_text_1_icon_item_class,\r
@@ -1783,17 +1462,6 @@ Evas_Object *Browser_Settings_Main_View::_create_content_genlist(void)
        if (!enable_location)\r
                elm_object_item_disabled_set(m_clear_location_access_callback_data.it, EINA_TRUE);\r
 \r
-       m_auto_save_item_callback_data.type = BR_PRIVACY_MENU_REMEMBER_PASSWORDS;\r
-       m_auto_save_item_callback_data.user_data = this;\r
-       m_auto_save_item_callback_data.it = elm_genlist_item_append(genlist, &m_2_text_1_icon_item_class,\r
-                                                       &m_auto_save_item_callback_data, NULL, ELM_GENLIST_ITEM_NONE,\r
-                                                       __on_off_check_clicked_cb, &m_auto_save_item_callback_data);\r
-\r
-       m_clear_passwords_callback_data.type = BR_PRIVACY_CLEAR_PASSWORDS;\r
-       m_clear_passwords_callback_data.user_data = this;\r
-       m_clear_passwords_callback_data.it = elm_genlist_item_append(genlist, &m_2_text_3_item_class,\r
-                                                       &m_clear_passwords_callback_data, NULL, ELM_GENLIST_ITEM_NONE,\r
-                                                       __genlist_item_clicked_cb, &m_clear_passwords_callback_data);\r
        /* Others */\r
        m_seperator_item_class.item_style = "grouptitle.dialogue.seperator";\r
        m_seperator_item_class.func.text_get = NULL;\r

diff --git a/src/browser-settings/browser-settings-main-view.h b/src/browser-settings/browser-settings-main-view.h
index 33ba78d..76534b5 100755 (executable)
--- a/src/browser-settings/browser-settings-main-view.h
+++ b/src/browser-settings/browser-settings-main-view.h
@@ -40,33 +40,29 @@ public:
                BR_HOMEPAGE_SUBMENU_USER_HOMEPAGE,\r
                BR_HOMEPAGE_SUBMENU_EMPTY_PAGE,\r
                BR_HOMEPAGE_SUBMENU_CURRENT_PAGE,\r
-               BR_CONTENT_TITLE = 10,\r
+               BR_CONTENT_TITLE,\r
                BR_CONTENT_MENU_DEFAULT_VIEW_LEVEL,\r
                BR_CONTENT_SUBMENU_FIT_TO_WIDTH,\r
                BR_CONTENT_SUBMENU_READABLE,\r
                BR_CONTENT_MENU_RUN_JAVASCRIPT,\r
                BR_CONTENT_MENU_DISPLAY_IMAGES,\r
                BR_CONTENT_MENU_BLOCK_POPUP,\r
-               BR_PRIVACY_TITLE = 20,\r
+               BR_PRIVACY_TITLE,\r
                BR_PRIVATE_MENU_CLEAR_CACHE,\r
                BR_PRIVATE_MENU_CLEAR_HISTORY,\r
                BR_PRIVATE_MENU_SHOW_SECURITY_WARNINGS,\r
                BR_PRIVACY_MENU_ACCEPT_COOKIES,\r
                BR_PRIVATE_MENU_CLEAR_ALL_COOKIE_DATA,\r
-               BR_PRIVACY_MENU_REMEMBER_FORM_DATA,\r
-               BR_PRIVACY_CLEAR_FORM_DATA,\r
-               BR_PRIVACY_MENU_REMEMBER_PASSWORDS = 30,\r
-               BR_PRIVACY_CLEAR_PASSWORDS,\r
                BR_PRIVACY_WEBSITE_SETTING,\r
                BR_PRIVACY_SUBMENU_ALWAYS_ASK,\r
                BR_PRIVACY_SUBMENU_ALWAYS_ON,\r
                BR_PRIVACY_SUBMENU_ALWAYS_OFF,\r
-               BR_PRIVACY_MENU_CLEAR_PRIVATE_DATA = 40,\r
+               BR_PRIVACY_MENU_CLEAR_PRIVATE_DATA,\r
                BR_PRIVACY_MENU_ENABLE_LOCATION,\r
                BR_PRIVACY_MENU_CLEAR_LOCATION_ACCESS,\r
-               BR_MENU_CERTIFICATES = 60,\r
+               BR_MENU_CERTIFICATES,\r
                BR_MENU_RESET_TO_DEFAULT,\r
-               BR_DEBUG_TITLE = 70,\r
+               BR_DEBUG_TITLE,\r
                BR_MENU_USER_AGENT,\r
                BR_MENU_UNKNOWN\r
        }menu_type;\r
@@ -92,8 +88,6 @@ private:
        Eina_Bool _show_clear_cache_confirm_popup(void);\r
        Eina_Bool _show_clear_history_confirm_popup(void);\r
        Eina_Bool _show_clear_all_cookie_data_confirm_popup(void);\r
-       Eina_Bool _show_clear_passwords_confirm_popup(void);\r
-       Eina_Bool _show_clear_form_data_confirm_popup(void);\r
 \r
        Eina_Bool _show_clear_location_confirm_popup(void);\r
        static void __clear_location_confirm_response_cb(void *data, Evas_Object *obj, void *event_info);\r
@@ -114,8 +108,6 @@ private:
                                                                void *event_info);\r
        static void __default_view_level_sub_item_clicked_cb(void *data,\r
                                                Evas_Object *obj, void *event_info);\r
-       static void __auto_save_id_pass_sub_item_clicked_cb(void *data,\r
-                                               Evas_Object *obj, void *event_info);\r
        static void __run_javascript_check_changed_cb(void *data,\r
                                                Evas_Object *obj, void *event_info);\r
        static void __display_images_check_changed_cb(void *data,\r
@@ -141,10 +133,6 @@ private:
        static void __cancel_clear_history_confirm_response_cb(void *data, Evas_Object *obj, void *event_info);\r
        static void __clear_all_cookie_data_confirm_response_cb(void *data, Evas_Object *obj, void *event_info);\r
        static void __cancel_clear_all_cookie_data_confirm_response_cb(void *data, Evas_Object *obj, void *event_info);\r
-       static void __clear_passwords_confirm_response_cb(void *data, Evas_Object *obj, void *event_info);\r
-       static void __cancel_clear_passwords_confirm_response_cb(void *data, Evas_Object *obj, void *event_info);\r
-       static void __clear_form_data_confirm_response_cb(void *data, Evas_Object *obj, void *event_info);\r
-       static void __cancel_clear_form_data_confirm_response_cb(void *data, Evas_Object *obj, void *event_info);\r
        static void __naviframe_pop_finished_cb(void *data , Evas_Object *obj, void *event_info);\r
        static void __application_cache_origin_get_cb(Eina_List* origins, void* user_data);\r
        static void __web_storage_origin_get_cb(Eina_List* origins, void* user_data);\r
@@ -191,13 +179,6 @@ private:
        genlist_callback_data m_show_security_warnings_item_callback_data;\r
        genlist_callback_data m_accept_cookies_item_callback_data;\r
        genlist_callback_data m_clear_all_cookies_data_item_callback_data;\r
-       genlist_callback_data m_auto_save_item_callback_data;\r
-       genlist_callback_data m_auto_save_form_data_callback_data;\r
-       genlist_callback_data m_clear_form_data_callback_data;\r
-       genlist_callback_data m_auto_save_always_ask_item_callback_data;\r
-       genlist_callback_data m_auto_save_always_on_item_callback_data;\r
-       genlist_callback_data m_auto_save_always_off_item_callback_data;\r
-       genlist_callback_data m_clear_passwords_callback_data;\r
        genlist_callback_data m_website_setting_callback_data;\r
        genlist_callback_data m_clear_private_data_item_callback_data;\r
        genlist_callback_data m_enable_location_callback_data;\r
@@ -216,12 +197,8 @@ private:
        Evas_Object *m_display_images_check;\r
        Evas_Object *m_block_popup_check;\r
        Evas_Object *m_clear_cache_confirm_popup;\r
-       Evas_Object *m_clear_passwords_confirm_popup;\r
-       Evas_Object *m_clear_form_data_confirm_popup;\r
        Evas_Object *m_clear_history_confirm_popup;\r
        Evas_Object *m_accept_cookies_check;\r
-       Evas_Object *m_auto_save_id_pass_check;\r
-       Evas_Object *m_auto_save_form_data_check;\r
        Evas_Object *m_clear_all_cookies_data_confirm_popup;\r
        Evas_Object *m_enable_location_check;\r
        Evas_Object *m_clear_location_confirm_popup;\r

diff --git a/src/include/browser-config.h b/src/include/browser-config.h
index 6343048..2c758b5 100755 (executable)
--- a/src/include/browser-config.h
+++ b/src/include/browser-config.h
@@ -114,8 +114,6 @@
 #define BLOCK_POPUP_KEY        "BlockPopup"\r
 #define SHOW_SECURITY_WARNINGS_KEY     "ShowSecurityWarnings"\r
 #define ACCEPT_COOKIES_KEY     "AcceptCookies"\r
-#define AUTO_SAVE_ID_PASSWORD_KEY      "AutoSaveIDPassword"\r
-#define AUTO_SAVE_FORM_DATA_KEY        "AutoSaveFormData"\r
 #define ENABLE_LOCATION_KEY    "EnableLocation"\r
 #ifdef ZOOM_BUTTON\r
 #define ZOOM_BUTTON_KEY        "Zoombutton"\r