From 9e2d98e42eb4ef5dec44e6f0d60f3a3d0f411b29 Mon Sep 17 00:00:00 2001
From: Asaf Romano <mano@mozilla.com>
Date: Tue, 8 Apr 2014 12:05:26 +0300
Subject: [PATCH] Bug 993274 - Remove cmd_new:livemark. r=mak

---
 browser/components/places/content/controller.js     | 6 ------
 browser/components/places/content/placesOverlay.xul | 2 --
 2 files changed, 8 deletions(-)

diff --git a/browser/components/places/content/controller.js b/browser/components/places/content/controller.js
index 4950ec54a579..0b279a0897d3 100644
--- a/browser/components/places/content/controller.js
+++ b/browser/components/places/content/controller.js
@@ -137,7 +137,6 @@ PlacesController.prototype = {
       case "cmd_paste":
       case "placesCmd_paste":
       case "placesCmd_new:folder":
-      case "placesCmd_new:livemark":
       case "placesCmd_new:bookmark":
       case "placesCmd_createBookmark":
         return false;
@@ -189,7 +188,6 @@ PlacesController.prototype = {
       var selectedNode = this._view.selectedNode;
       return selectedNode && PlacesUtils.nodeIsURI(selectedNode);
     case "placesCmd_new:folder":
-    case "placesCmd_new:livemark":
       return this._canInsert();
     case "placesCmd_new:bookmark":
       return this._canInsert();
@@ -280,9 +278,6 @@ PlacesController.prototype = {
     case "placesCmd_new:bookmark":
       this.newItem("bookmark");
       break;
-    case "placesCmd_new:livemark":
-      this.newItem("livemark");
-      break;
     case "placesCmd_new:separator":
       this.newSeparator().then(null, Cu.reportError);
       break;
@@ -1684,7 +1679,6 @@ function goUpdatePlacesCommands() {
   updatePlacesCommand("placesCmd_open:tab");
   updatePlacesCommand("placesCmd_new:folder");
   updatePlacesCommand("placesCmd_new:bookmark");
-  updatePlacesCommand("placesCmd_new:livemark");
   updatePlacesCommand("placesCmd_new:separator");
   updatePlacesCommand("placesCmd_show:info");
   updatePlacesCommand("placesCmd_moveBookmarks");
diff --git a/browser/components/places/content/placesOverlay.xul b/browser/components/places/content/placesOverlay.xul
index 0e5f1804a462..d62756835e16 100644
--- a/browser/components/places/content/placesOverlay.xul
+++ b/browser/components/places/content/placesOverlay.xul
@@ -59,8 +59,6 @@
 
     <command id="placesCmd_new:bookmark"
              oncommand="goDoPlacesCommand('placesCmd_new:bookmark');"/>
-    <command id="placesCmd_new:livemark"
-             oncommand="goDoPlacesCommand('placesCmd_new:livemark');"/>
     <command id="placesCmd_new:folder"
              oncommand="goDoPlacesCommand('placesCmd_new:folder');"/>
     <command id="placesCmd_new:separator"