From b7e24094981762ec7b007b9b1df7c5007c28b67c Mon Sep 17 00:00:00 2001
From: Arthur Chen <crh0716@gmail.com>
Date: Thu, 4 Sep 2014 15:02:27 +0800
Subject: [PATCH] Merge pull request #23602 from crh0716/1061391

Bug 1061391 - Remove the button of clear browsing data r=eragonj
---
 apps/settings/elements/app_permissions.html   | 21 -----------
 .../app_permissions_list.js                   | 36 +++----------------
 .../js/panels/app_permissions_list/panel.js   | 23 ++----------
 .../app_permissions_list_test.js              | 26 +++++---------
 4 files changed, 16 insertions(+), 90 deletions(-)

diff --git a/apps/settings/elements/app_permissions.html b/apps/settings/elements/app_permissions.html
index 2219cf62a0f4..17c9b399181b 100644
--- a/apps/settings/elements/app_permissions.html
+++ b/apps/settings/elements/app_permissions.html
@@ -7,29 +7,8 @@ <h1 data-l10n-id="appPermissions-header">App permissions</h1>
 
     <div>
       <ul class="app-list"></ul>
-
-      <ul>
-        <li>
-          <button class="clear-bookmarks-app" data-l10n-id="clearBookmarkAppsData" hidden>
-            Clear bookmarks data
-          </button>
-        </li>
-      </ul>
     </div>
 
-    <form role="dialog" data-type="confirm" hidden class="cb-alert">
-      <section>
-        <h1 data-l10n-id="confirmClearBookmarkAppsDataTitle">Clear private data from bookmarks</h1>
-        <p>
-          <strong data-l10n-id="confirmClearBookmarkAppsDataDesc">This clear private data from bookmarks that have been added to the home screen. This cannot be undone.</strong>
-        </p>
-      </section>
-      <menu>
-        <button class="cb-alert-cancel" data-l10n-id="cancel">Cancel</button>
-        <button class="cb-alert-clear recommend danger" data-l10n-id="clear">Clear</button>
-      </menu>
-    </form>
-
     <panel data-path="panels/app_permissions_list/panel"></panel>
 
   </template>
diff --git a/apps/settings/js/panels/app_permissions_list/app_permissions_list.js b/apps/settings/js/panels/app_permissions_list/app_permissions_list.js
index 34af3c19a40b..f510ce2b5239 100644
--- a/apps/settings/js/panels/app_permissions_list/app_permissions_list.js
+++ b/apps/settings/js/panels/app_permissions_list/app_permissions_list.js
@@ -7,12 +7,11 @@ define(function(require) {
 
   var SettingsService = require('modules/settings_service');
   var ManifestHelper = require('shared/manifest_helper');
-  var SettingsListener = require('shared/settings_listener');
   var mozApps = require('modules/navigator/mozApps');
   var mozPerms = require('modules/navigator/mozPermissionSettings');
 
   var PermissionsList = function pl() {
-    this._elements = null;
+    this._listRoot = null;
     this._permissionsTable = null;
     this._permissionTableHaveProcessed = false;
     this._apps = null;
@@ -22,8 +21,8 @@ define(function(require) {
     /**
      * initialization
      */
-    init: function pl_init(elements) {
-      this._elements = elements;
+    init: function pl_init(listRoot) {
+      this._listRoot = listRoot;
     },
 
     /**
@@ -58,30 +57,6 @@ define(function(require) {
       }
     },
 
-    /**
-     * Confirm to clear bookmarks data and close the dialog.
-     */
-    confirmGoClicked: function pl_confirm_go_clicked() {
-      SettingsListener.getSettingsLock().set({
-        'clear.remote-windows.data': true
-      });
-      this._elements.dialog.hidden = true;
-    },
-
-    /**
-     * Cancel to clear data of bookmarks data and close the dialog.
-     */
-    confirmCancelClicked: function pl_confirm_cacel_clicked(evt) {
-      this._elements.dialog.hidden = true;
-    },
-
-    /**
-     * Show clear-bookmarks dialog.
-     */
-    clearBookmarksData: function pl_clear_bookmarks_data(evt) {
-      this._elements.dialog.hidden = false;
-    },
-
     /**
      * When new application is installed, we push the app to list, sort them and
      * rerender the app list.
@@ -151,7 +126,7 @@ define(function(require) {
      * Genrate UI template of app item.
      */
     renderList: function pl_render_list() {
-      this._elements.list.innerHTML = '';
+      this._listRoot.innerHTML = '';
       var listFragment = document.createDocumentFragment();
       this._apps.forEach(function appIterator(app, index) {
         var manifest = new ManifestHelper(app.manifest ?
@@ -163,8 +138,7 @@ define(function(require) {
         });
         listFragment.appendChild(li);
       }.bind(this));
-      this._elements.list.appendChild(listFragment);
-      this._elements.mainButton.hidden = false;
+      this._listRoot.appendChild(listFragment);
     },
 
     /**
diff --git a/apps/settings/js/panels/app_permissions_list/panel.js b/apps/settings/js/panels/app_permissions_list/panel.js
index 75bc867b4eb4..f41f9fd588e9 100644
--- a/apps/settings/js/panels/app_permissions_list/panel.js
+++ b/apps/settings/js/panels/app_permissions_list/panel.js
@@ -18,21 +18,6 @@ define(function(require) {
         eventType: 'click',
         methodName: 'onAppChoose'
       },
-      {
-        elementName: 'goButton',
-        eventType: 'click',
-        methodName: 'confirmGoClicked'
-      },
-      {
-        elementName: 'mainButton',
-        eventType: 'click',
-        methodName: 'clearBookmarksData'
-      },
-      {
-        elementName: 'cancelButton',
-        eventType: 'click',
-        methodName: 'confirmCancelClicked'
-      },
       {
         eventType: 'applicationinstall',
         methodName: 'onApplicationInstall'
@@ -72,13 +57,9 @@ define(function(require) {
     return SettingsPanel({
       onInit: function(panel) {
         elements = {
-          list: panel.querySelector('.app-list'),
-          dialog: panel.querySelector('.cb-alert'),
-          goButton: panel.querySelector('.cb-alert-clear'),
-          cancelButton: panel.querySelector('.cb-alert-cancel'),
-          mainButton: panel.querySelector('.clear-bookmarks-app')
+          list: panel.querySelector('.app-list')
         };
-        permissionListModule.init(elements);
+        permissionListModule.init(elements.list);
       },
 
       onBeforeShow: function() {
diff --git a/apps/settings/test/unit/panels/app_permissions/app_permissions_list_test.js b/apps/settings/test/unit/panels/app_permissions/app_permissions_list_test.js
index bec39fece4a8..4442566f0a0c 100644
--- a/apps/settings/test/unit/panels/app_permissions/app_permissions_list_test.js
+++ b/apps/settings/test/unit/panels/app_permissions/app_permissions_list_test.js
@@ -4,18 +4,10 @@
 suite('app permission list > ', function() {
   var PermissionList;
 
-  var mock_elements = {
-    dialog: {
-      hidden: false
-    },
-    list: {
-      children: [],
-      appendChild: function(item) {
-        this.children.push(item);
-      }
-    },
-    mainButton: {
-      hidden: false
+  var mock_listRoot = {
+    children: [],
+    appendChild: function(item) {
+      this.children.push(item);
     }
   };
 
@@ -86,14 +78,14 @@ suite('app permission list > ', function() {
     setup(function() {
       MockMozApps.mAddToCurrentApp(mock_app2);
       permissionList = PermissionList();
-      permissionList.init(mock_elements);
+      permissionList.init(mock_listRoot);
       permissionList.setPermissionsTable(mock_permissionsTable);
       permissionList._permissionTableHaveProcessed = false;
       permissionList.refresh();
     });
 
     teardown(function() {
-      permissionList._elements.list.children.length = 0;
+      permissionList._listRoot.children.length = 0;
     });
 
     test('the app list content when push mock_app1 to permission list',
@@ -103,7 +95,7 @@ suite('app permission list > ', function() {
         MockMozApps.mTriggerGetCurrentAppCallback();
         MockMozApps.mTriggerGetAllAppsCallback();
 
-        var list = permissionList._elements.list.children[0];
+        var list = permissionList._listRoot.children[0];
 
         assert.equal(list.querySelector('li:nth-child(1) a')
           .dataset.appIndex, 0, 'the appIndex of first app should be 0');
@@ -125,7 +117,7 @@ suite('app permission list > ', function() {
         application: mock_app1
       });
 
-      var list = permissionList._elements.list.children[0];
+      var list = permissionList._listRoot.children[0];
       assert.equal(list.querySelector('li:nth-child(1) img').src,
         'app://settings.gaiamobile.org/test/style/images/default.png',
         'should display info of mock_app1 after we install it');
@@ -139,7 +131,7 @@ suite('app permission list > ', function() {
         }
       });
 
-      var list = permissionList._elements.list.children[0];
+      var list = permissionList._listRoot.children[0];
       assert.equal(list.querySelector('li:nth-child(1) a').dataset.appIndex, 0);
       assert.equal(list.querySelector('li:nth-child(1) img').src,
         'app://settings.gaiamobile.org/test/style/images/default.png',