Merging mozilla-central to mozilla-qt.

accessible/src/base/nsAccessNode.cpp

@@ -794,8 +794,11 @@ nsAccessNode::GetCacheEntry(nsAccessNodeHashtable& aCache,
 
 PLDHashOperator nsAccessNode::ClearCacheEntry(const void* aKey, nsCOMPtr<nsIAccessNode>& aAccessNode, void* aUserArg)
 {
-  nsCOMPtr<nsPIAccessNode> privateAccessNode(do_QueryInterface(aAccessNode));
-  privateAccessNode->Shutdown();
+  NS_ASSERTION(!aAccessNode, "Calling ClearCacheEntry with a NULL pointer!");
+  if (aAccessNode) {
+    nsCOMPtr<nsPIAccessNode> privateAccessNode(do_QueryInterface(aAccessNode));
+    privateAccessNode->Shutdown();
+  }
 
   return PL_DHASH_REMOVE;
 }

accessible/src/base/nsAccessibilityAtomList.h

@@ -231,7 +231,7 @@ ACCESSIBILITY_ATOM(aria_valuetext, "aria-valuetext")
 ACCESSIBILITY_ATOM(defaultLabel, "defaultLabel")
 
 // Object attributes
-ACCESSIBILITY_ATOM(cellIndex, "cell-index")
+ACCESSIBILITY_ATOM(tableCellIndex, "table-cell-index")
 ACCESSIBILITY_ATOM(containerAtomic, "container-atomic")
 ACCESSIBILITY_ATOM(containerBusy, "container-busy")
 ACCESSIBILITY_ATOM(containerChannel, "container-channel")

accessible/src/base/nsAccessible.cpp

@@ -1440,20 +1440,54 @@ NS_IMETHODIMP nsAccessible::TakeSelection()
 }
 
 /* void takeFocus (); */
-NS_IMETHODIMP nsAccessible::TakeFocus()
-{ 
-  nsCOMPtr<nsIDOMNSHTMLElement> htmlElement(do_QueryInterface(mDOMNode));
+NS_IMETHODIMP
+nsAccessible::TakeFocus()
+{
+  if (IsDefunct())
+    return NS_ERROR_FAILURE;
+
+  nsCOMPtr<nsIContent> content(do_QueryInterface(mDOMNode));
+
+  nsIFrame *frame = GetFrame();
+  NS_ENSURE_STATE(frame);
+
+  // If the current element can't take real DOM focus and if it has an ID and
+  // ancestor with a the aria-activedescendant attribute present, then set DOM
+  // focus to that ancestor and set aria-activedescendant on the ancestor to
+  // the ID of the desired element.
+  if (!frame->IsFocusable()) {
+    nsAutoString id;
+    if (content && nsAccUtils::GetID(content, id)) {
+
+      nsCOMPtr<nsIContent> ancestorContent = content;
+      while ((ancestorContent = ancestorContent->GetParent()) &&
+             !ancestorContent->HasAttr(kNameSpaceID_None,
+                                       nsAccessibilityAtoms::aria_activedescendant));
+
+      if (ancestorContent) {
+        nsCOMPtr<nsIPresShell> presShell(do_QueryReferent(mWeakShell));
+        if (presShell) {
+          nsIFrame *frame = presShell->GetPrimaryFrameFor(ancestorContent);
+          if (frame && frame->IsFocusable()) {
+
+            content = ancestorContent;            
+            content->SetAttr(kNameSpaceID_None,
+                             nsAccessibilityAtoms::aria_activedescendant,
+                             id, PR_TRUE);
+          }
+        }
+      }
+    }
+  }
+
+  nsCOMPtr<nsIDOMNSHTMLElement> htmlElement(do_QueryInterface(content));
   if (htmlElement) {
     // HTML Elements also set the caret position
     // in order to affect tabbing order
     return htmlElement->Focus();
   }
-  nsCOMPtr<nsIContent> content(do_QueryInterface(mDOMNode));
-  if (!content) {
-    return NS_ERROR_FAILURE;
-  }
-  content->SetFocus(GetPresContext());
 
+  content->SetFocus(GetPresContext());
   return NS_OK;
 }
 

accessible/src/base/nsApplicationAccessible.cpp

@@ -91,14 +91,6 @@ nsApplicationAccessible::GetName(nsAString& aName)
   return NS_OK;
 }
 
-NS_IMETHODIMP
-nsApplicationAccessible::GetDescription(nsAString& aDescription)
-{
-  GetName(aDescription);
-  aDescription.AppendLiteral(" Application Accessible");
-  return NS_OK;
-}
-
 NS_IMETHODIMP
 nsApplicationAccessible::GetRole(PRUint32 *aRole)
 {

accessible/src/base/nsApplicationAccessible.h

@@ -69,7 +69,6 @@ public:
 
   // nsIAccessible
   NS_IMETHOD GetName(nsAString & aName);
-  NS_IMETHOD GetDescription(nsAString & aDescription);
   NS_IMETHOD GetRole(PRUint32 *aRole);
   NS_IMETHOD GetFinalRole(PRUint32 *aFinalRole);
   NS_IMETHOD GetState(PRUint32 *aState, PRUint32 *aExtraState);

accessible/src/base/nsDocAccessible.cpp

@@ -1562,9 +1562,12 @@ NS_IMETHODIMP nsDocAccessible::FlushPendingEvents()
       // wait to fire this here, instead of in InvalidateCacheSubtree(), where we wouldn't be able to calculate
       // the offset, length and text for the text change.
       if (domNode && domNode != mDOMNode) {
-        if (!containerAccessible)
+        if (!containerAccessible) {
           GetAccessibleInParentChain(domNode, PR_TRUE,
                                      getter_AddRefs(containerAccessible));
+          if (!containerAccessible)
+            containerAccessible = this;
+        }
 
         nsCOMPtr<nsIAccessibleTextChangeEvent> textChangeEvent =
           CreateTextChangeEventForNode(containerAccessible, domNode, accessible, PR_TRUE, PR_TRUE);
@@ -2066,10 +2069,10 @@ nsDocAccessible::FireShowHideEvents(nsIDOMNode *aDOMNode, PRBool aAvoidOnThisNod
 
   // Could not find accessible to show hide yet, so fire on any
   // accessible descendants in this subtree
-  nsCOMPtr<nsIContent> content(do_QueryInterface(aDOMNode));
-  PRUint32 count = content->GetChildCount();
+  nsCOMPtr<nsINode> node(do_QueryInterface(aDOMNode));
+  PRUint32 count = node->GetChildCount();
   for (PRUint32 index = 0; index < count; index++) {
-    nsCOMPtr<nsIDOMNode> childNode = do_QueryInterface(content->GetChildAt(index));
+    nsCOMPtr<nsIDOMNode> childNode = do_QueryInterface(node->GetChildAt(index));
     nsresult rv = FireShowHideEvents(childNode, PR_FALSE, aEventType,
                                      aDelay, aForceIsFromUserInput);
     NS_ENSURE_SUCCESS(rv, rv);

accessible/src/base/nsRootAccessible.cpp

@@ -238,10 +238,12 @@ nsRootAccessible::GetState(PRUint32 *aState, PRUint32 *aExtraState)
   if (privateDOMWindow) {
     nsIFocusController *focusController =
       privateDOMWindow->GetRootFocusController();
-    PRBool isActive = PR_FALSE;
-    focusController->GetActive(&isActive);
-    if (isActive) {
-      *aExtraState |= nsIAccessibleStates::EXT_STATE_ACTIVE;
+    if (focusController) {
+      PRBool isActive = PR_FALSE;
+      focusController->GetActive(&isActive);
+      if (isActive) {
+        *aExtraState |= nsIAccessibleStates::EXT_STATE_ACTIVE;
+      }
     }
   }
 #ifdef MOZ_XUL

accessible/src/html/nsHTMLImageAccessible.cpp

@@ -130,24 +130,34 @@ nsHTMLImageAccessible::GetState(PRUint32 *aState, PRUint32 *aExtraState)
 /* wstring getName (); */
 NS_IMETHODIMP nsHTMLImageAccessible::GetName(nsAString& aName)
 {
+  aName.Truncate();
+  if (IsDefunct())
+    return NS_ERROR_FAILURE;
+  
   nsCOMPtr<nsIContent> content(do_QueryInterface(mDOMNode));
-  if (!content) {
-    return NS_ERROR_FAILURE;  // Node has been shut down
-  }
-
-  if (!content->GetAttr(kNameSpaceID_None, nsAccessibilityAtoms::alt,
-                        aName)) {
-    if (mRoleMapEntry) {
+  NS_ASSERTION(content, "Image node always supports nsIContent");
+    
+  // No alt attribute means AT can repair if there is no accessible name
+  // alt="" with no title or aria-labelledby means image is presentational and 
+  // AT should leave accessible name empty
+  PRBool hasAltAttrib =
+    content->GetAttr(kNameSpaceID_None, nsAccessibilityAtoms::alt, aName);
+  if (aName.IsEmpty()) {
+    if (content->HasAttr(kNameSpaceID_None, nsAccessibilityAtoms::aria_labelledby)) {
       // Use HTML label or DHTML accessibility's labelledby attribute for name
       // GetHTMLName will also try title attribute as a last resort
-      return GetHTMLName(aName, PR_FALSE);
+      GetHTMLName(aName, PR_FALSE);
     }
-    if (!content->GetAttr(kNameSpaceID_None, nsAccessibilityAtoms::title,
-                          aName)) {
-      aName.SetIsVoid(PR_TRUE); // No alt or title
+    if (aName.IsEmpty()) { // No name from alt or aria-labelledby
+      content->GetAttr(kNameSpaceID_None, nsAccessibilityAtoms::title, aName);
+      if (!hasAltAttrib && aName.IsEmpty()) { 
+        // Still no accessible name and no alt attribute is present.
+        // SetIsVoid() is different from empty string -- this means a name was not 
+        // provided by author and AT repair of the name is allowed.
+        aName.SetIsVoid(PR_TRUE);
+      }
     }
   }
-
   return NS_OK;
 }
 
@@ -325,6 +335,25 @@ nsHTMLImageAccessible::Shutdown()
 ////////////////////////////////////////////////////////////////////////////////
 // nsHTMLImageAccessible
 
+nsresult
+nsHTMLImageAccessible::GetAttributesInternal(nsIPersistentProperties *aAttributes)
+{
+  if (IsDefunct())
+    return NS_ERROR_FAILURE;
+  
+  nsresult rv = nsLinkableAccessible::GetAttributesInternal(aAttributes);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  nsCOMPtr<nsIContent> content(do_QueryInterface(mDOMNode));
+
+  nsAutoString src;
+  content->GetAttr(kNameSpaceID_None, nsAccessibilityAtoms::src, src);
+  if (!src.IsEmpty())
+    nsAccUtils::SetAccAttr(aAttributes, nsAccessibilityAtoms::src, src);
+
+  return NS_OK;
+}
+
 already_AddRefed<nsIDOMHTMLCollection>
 nsHTMLImageAccessible::GetAreaCollection()
 {

accessible/src/html/nsHTMLImageAccessible.h

@@ -77,6 +77,9 @@ public:
   // nsIAccessibleImage
   NS_DECL_NSIACCESSIBLEIMAGE
 
+  // nsAccessible
+  virtual nsresult GetAttributesInternal(nsIPersistentProperties *aAttributes);
+
 protected:
   // nsAccessible
   virtual void CacheChildren();

accessible/src/html/nsHTMLTableAccessible.cpp

@@ -92,6 +92,9 @@ nsHTMLTableCellAccessible::GetAttributesInternal(nsIPersistentProperties *aAttri
   NS_ENSURE_STATE(shell);
   
   nsIFrame *frame = shell->GetPrimaryFrameFor(content);
+  NS_ASSERTION(frame, "The frame cannot be obtaied for HTML table cell.");
+  NS_ENSURE_STATE(frame);
+
   nsITableCellLayout *cellLayout = nsnull;
   CallQueryInterface(frame, &cellLayout);
   NS_ENSURE_STATE(cellLayout);
@@ -121,7 +124,7 @@ nsHTMLTableCellAccessible::GetAttributesInternal(nsIPersistentProperties *aAttri
 
       nsAutoString stringIdx;
       stringIdx.AppendInt(idx);
-      nsAccUtils::SetAccAttr(aAttributes, nsAccessibilityAtoms::cellIndex,
+      nsAccUtils::SetAccAttr(aAttributes, nsAccessibilityAtoms::tableCellIndex,
                              stringIdx);
       return NS_OK;
     }

accessible/src/msaa/CAccessibleAction.cpp

@@ -120,7 +120,7 @@ __try {
   if (NS_FAILED(rv))
     return GetHRESULT(rv);
 
-  if (description.IsVoid())
+  if (description.IsEmpty())
     return S_FALSE;
 
   *aDescription = ::SysAllocStringLen(description.get(),

accessible/src/msaa/CAccessibleText.cpp

@@ -99,6 +99,9 @@ CAccessibleText::get_attributes(long aOffset, long *aStartOffset,
                                 long *aEndOffset, BSTR *aTextAttributes)
 {
 __try {
+  if (!aStartOffset || !aEndOffset || !aTextAttributes)
+    return E_INVALIDARG;
+
   *aStartOffset = 0;
   *aEndOffset = 0;
   *aTextAttributes = NULL;

accessible/src/msaa/nsAccessibleWrap.cpp

@@ -291,19 +291,29 @@ __try {
   *pszName = NULL;
   nsCOMPtr<nsIAccessible> xpAccessible;
   GetXPAccessibleFor(varChild, getter_AddRefs(xpAccessible));
-  if (xpAccessible) {
-    nsAutoString name;
-    if (NS_FAILED(xpAccessible->GetName(name)))
-      return E_FAIL;
+  if (!xpAccessible)
+    return E_FAIL;
+  nsAutoString name;
+  nsresult rv = xpAccessible->GetName(name);
+  if (NS_FAILED(rv))
+    return GetHRESULT(rv);
+    
+  if (name.IsVoid()) {
+    // Valid return value for the name:
+    // The name was not provided, e.g. no alt attribute for an image.
+    // A screen reader may choose to invent its own accessible name, e.g. from
+    // an image src attribute.
+    // See nsHTMLImageAccessible::GetName()
+    return S_OK;
+  }
 
-    *pszName = ::SysAllocStringLen(name.get(), name.Length());
-    if (!*pszName)
-      return E_OUTOFMEMORY;
+  *pszName = ::SysAllocStringLen(name.get(), name.Length());
+  if (!*pszName)
+    return E_OUTOFMEMORY;
 
 #ifdef DEBUG_A11Y
-    NS_ASSERTION(mIsInitialized, "Access node was not initialized");
+  NS_ASSERTION(mIsInitialized, "Access node was not initialized");
 #endif
-  }
 } __except(FilterA11yExceptions(::GetExceptionCode(), GetExceptionInformation())) { }
 
   return S_OK;

accessible/tests/mochitest/Makefile.in

@@ -46,6 +46,8 @@ include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 
 _TEST_FILES =\
+		moz.png \
+		test_aria_activedescendant.html \
 		test_bug368835.xul \
 		test_bug420863.html \
 		test_groupattrs.xul \
@@ -58,6 +60,7 @@ _TEST_FILES =\
 		test_nsIAccessibleHyperLink.html \
 		test_nsIAccessibleHyperLink.xul \
 		test_nsIAccessibleHyperText.html \
+		test_nsIAccessibleImage.html \
 		test_bug428479.html \
 		$(NULL)
 

accessible/tests/mochitest/test_aria_activedescendant.html

@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=429547
+-->
+<head>
+  <title>Table indexes chrome tests</title>
+  <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css" />
+
+  <script type="application/javascript" src="chrome://mochikit/content/MochiKit/packed.js"></script>
+  <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
+
+  <script type="application/javascript">
+    const nsIAccessibleRetrieval = Components.interfaces.nsIAccessibleRetrieval;
+    const ELEMENT_NODE = Components.interfaces.nsIDOMNode.ELEMENT_NODE;
+
+    var gAccRetrieval = null;
+    var gContainerFocused = false;
+
+    function doTest()
+    {
+      var focusHandler = {
+        handleEvent: function handleEvent(aEvent) {
+          var target = aEvent.target;
+          if (target.nodeType ==  ELEMENT_NODE &&
+              target.getAttribute("id") == "container")
+            gContainerFocused = true;
+        }
+      };
+
+      var container = document.getElementById("container");
+      container.addEventListener("focus", focusHandler, false);
+
+      gAccRetrieval = Components.classes["@mozilla.org/accessibleRetrieval;1"].
+                      getService(nsIAccessibleRetrieval);
+
+      var item2 = document.getElementById("item2");
+      var item2Acc = null;
+      try {
+        item2Acc = gAccRetrieval.getAccessibleFor(item2);
+      } catch (e) {}
+      ok (item2Acc,
+          "The element with ID and an ancestor with 'aria-activedescedant' attribute should be accessible.");
+
+      if (item2Acc)
+        item2Acc.takeFocus();
+
+      ok(gContainerFocused,
+         "Container with active descedant didn't recieved the focus.");
+
+      SimpleTest.finish();
+    }
+
+    SimpleTest.waitForExplicitFinish();
+    addLoadEvent(doTest);
+  </script>
+</head>
+<body>
+
+  <a target="_blank"
+     href="https://bugzilla.mozilla.org/show_bug.cgi?id=429547"
+     title="Support aria-activedescendant usage in nsIAccesible::TakeFocus()">
+    Mozilla Bug 429547
+  </a>
+  <p id="display"></p>
+  <div id="content" style="display: none"></div>
+  <pre id="test">
+  </pre>
+
+  <div aria-activedescendant="item1" id="container" tabindex="1">
+    <div id="item1">item1</div>
+    <div id="item2">item2</div>
+    <div id="item3">item3</div>
+  </div>
+</body>
+</html>

accessible/tests/mochitest/test_nsIAccessibleImage.html

@@ -0,0 +1,171 @@
+<!DOCTYPE html>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=429659
+-->
+<head>
+  <title>nsIAccessibleImage chrome tests</title>
+  <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css" />
+
+  <script type="application/javascript" src="chrome://mochikit/content/MochiKit/packed.js"></script>
+  <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
+
+  <script type="application/javascript">
+    const nsIAccessibleImage = Components.interfaces.nsIAccessibleImage;
+    const nsIAccessibleCoordinateType = 
+          Components.interfaces.nsIAccessibleCoordinateType;
+
+    var gAccRetrieval;
+
+    function testCords(aID, aImageAcc, aCordType, aXCoordinate, aYCoordinate,
+                       aCoordTypeString)
+    {
+      var x = {}, y = {};
+      aImageAcc.getImagePosition(aCordType, x, y);
+      is(x.value, aXCoordinate,
+         "Wrong " + aCoordTypeString + " x offset for " + aID + "!");
+      is(y.value, aYCoordinate,
+         "Wrong " + aCoordTypeString + " y offset for " + aID + "!");
+    }
+
+    function testCoordinates(aID, aAcc, aXCoordinates, aYCoordinates, aWidth,
+                             aHeight)
+    {
+      var imageAcc;
+      try {
+        imageAcc = aAcc.QueryInterface(nsIAccessibleImage);
+      } catch(e) {}
+      ok(imageAcc, "no image interface for " + aID + "!");
+
+      testCords(aID, imageAcc,
+                nsIAccessibleCoordinateType.COORDTYPE_SCREEN_RELATIVE,
+                aXCoordinates[0], aYCoordinates[0], "screen");
+      testCords(aID, imageAcc,
+                nsIAccessibleCoordinateType.COORDTYPE_WINDOW_RELATIVE,
+                aXCoordinates[1], aYCoordinates[1], "window");
+      testCords(aID, imageAcc,
+                nsIAccessibleCoordinateType.COORDTYPE_PARENT_RELATIVE,
+                aXCoordinates[2], aYCoordinates[2], "parent");
+
+      var width = {}, height = {};
+      imageAcc.getImageSize(width, height);
+      is(width.value, aWidth, "Wrong width for " + aID + "!");
+      is(height.value, aHeight, "wrong height for " + aID + "!");
+    }
+
+    function testThis(aID, aName, aSRC, aXCoordinates, aYCoordinates, aWidth,
+                      aHeight)
+    {
+      var elem = document.getElementById(aID);
+      var acc;
+      try {
+        acc = gAccRetrieval.getAccessibleFor(elem);
+      } catch(e) {}
+      ok(acc, "No accessible for " + aID + "!");
+      is(acc.name, aName, "wrong name for " + aID + "!");
+
+      // test coordinates and size
+      testCoordinates(aID, acc, aXCoordinates, aYCoordinates, aWidth, aHeight);
+
+      // bug 429659: Make sure the SRC attribute is set for any image
+      var attributes;
+      try {
+        attributes = acc.attributes;
+      } catch(e) {}
+      ok(attributes, "no attributes on " + aID + "!");
+      is(attributes.getStringProperty("src"), aSRC,
+         "no correct src attribute for " + aID + "!");
+    }
+
+    function doTest()
+    {
+      gAccRetrieval = Components.classes["@mozilla.org/accessibleRetrieval;1"].
+                       getService(Components.interfaces.nsIAccessibleRetrieval);
+
+      // Test non-linked image
+      var xCords = [16, 12, 8];
+      var yCords = [227, 223, 113];
+      testThis("nonLinkedImage", null, "moz.png", xCords, yCords, 89, 38);
+
+      // Test linked image
+      xCords = [16, 12, 0];
+      yCords = [289, 285, -27];
+      testThis("linkedImage", null, "moz.png", xCords, yCords, 93, 42);
+
+      // Test non-linked image with alt attribute
+      xCords = [16, 12, 8];
+      yCords = [356, 352, 242];
+      testThis("nonLinkedImageWithAlt", "MoFo", "moz.png", xCords, yCords, 89, 38);
+
+      // Test linked image with alt attribute
+      xCords = [16, 12, 0];
+      yCords = [418, 414, -27];
+      testThis("linkedImageWithAlt", "MoFo link", "moz.png", xCords, yCords, 93, 42);
+
+      // Test non-linked image with title attribute
+      xCords = [16, 12, 8];
+      yCords = [485, 481, 371];
+      testThis("nonLinkedImageWithTitle", "MoFo logo", "moz.png", xCords, yCords, 89, 38);
+
+      // Test linked image with title attribute
+      xCords = [16, 12, 0];
+      yCords = [547, 543, -27];
+      testThis("linkedImageWithTitle", "Link to MoFo", "moz.png", xCords, yCords, 93, 42);
+
+      // Test simple image with empty alt attribute
+      xCords = [16, 12, 8];
+      yCords = [614, 610, 500];
+      testThis("nonLinkedImageEmptyAlt", "", "moz.png", xCords, yCords, 89, 38);
+
+      // Test linked image with empty alt attribute
+      xCords = [16, 12, 0];
+      yCords = [676, 672, -27];
+      testThis("linkedImageEmptyAlt", "", "moz.png", xCords, yCords, 93, 42);
+
+      // Test simple image with empty alt attribute and title
+      xCords = [16, 12, 8];
+      yCords = [743, 739, 629];
+      testThis("nonLinkedImageEmptyAltAndTitle", "MozillaFoundation", "moz.png", xCords, yCords, 89, 38);
+
+      // Test linked image with empty alt attribute and title
+      xCords = [16, 12, 0];
+      yCords = [805, 801, -27];
+      testThis("linkedImageEmptyAltAndTitle", "Link to Mozilla Foundation", "moz.png", xCords, yCords, 93, 42);
+
+      SimpleTest.finish();
+    }
+
+    SimpleTest.waitForExplicitFinish();
+    addLoadEvent(doTest);
+  </script>
+</head>
+<body>
+
+  <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=429659">Mozilla Bug 429659</a>
+  <p id="display"></p>
+  <div id="content" style="display: none"></div>
+  <pre id="test">
+  </pre>
+  <br>Simple image:<br>
+  <img id="nonLinkedImage" src="moz.png"/>
+  <br>Linked image:<br>
+  <a href="http://www.mozilla.org"><img id="linkedImage" src="moz.png"></a>
+  <br>Simple image with alt:<br>
+  <img id="nonLinkedImageWithAlt" src="moz.png" alt="MoFo"/>
+  <br>Linked image with alt:<br>
+  <a href="http://www.mozilla.org"><img id="linkedImageWithAlt" src="moz.png" alt="MoFo link"/></a>
+  <br>Simple image with title:<br>
+  <img id="nonLinkedImageWithTitle" src="moz.png" title="MoFo logo"/>
+  <br>Linked image with title:<br>
+  <a href="http://www.mozilla.org"><img id="linkedImageWithTitle" src="moz.png" title="Link to MoFo"/></a>
+  <br>Simple image with empty alt:<br>
+  <img id="nonLinkedImageEmptyAlt" src="moz.png" alt=""/>
+  <br>Linked image with empty alt:<br>
+  <a href="http://www.mozilla.org"><img id="linkedImageEmptyAlt" src="moz.png" alt=""/></a>
+  <br>Simple image with empty alt and title:<br>
+  <img id="nonLinkedImageEmptyAltAndTitle" src="moz.png" alt="" title="MozillaFoundation"/>
+  <br>Linked image with empty alt and title:<br>
+  <a href="http://www.mozilla.org"><img id="linkedImageEmptyAltAndTitle" src="moz.png" alt=""
+     title="Link to Mozilla Foundation"/></a>
+</body>
+</html>

accessible/tests/mochitest/test_table_indexes.html

@@ -89,7 +89,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=410052
 
         if (cellAcc) {
           var attrs = cellAcc.attributes;
-          is (parseInt(attrs.getStringProperty("cell-index")), index,
+          is (parseInt(attrs.getStringProperty("table-cell-index")), index,
               aId + ": cell index from object attributes of cell accessible isn't corrent.");
         }
       }

browser/app/Makefile.in

@@ -76,6 +76,9 @@ ifdef MOZ_MEMORY
 ifeq ($(OS_ARCH),Darwin)
 LIBS += -ljemalloc
 endif
+ifeq ($(OS_ARCH),SunOS)
+SOLARIS_JEMALLOC_LDFLAGS = -L$(LIBXUL_DIST)/bin -lxul
+endif
 endif
 
 ifdef LIBXUL_SDK

browser/app/blocklist.xml

@@ -16,4 +16,11 @@
       </versionRange>
     </emItem>
   </emItems>
+<pluginItems>
+  <pluginItem>
+    <match name="name" exp="Yahoo Application State Plugin"/>
+    <match name="description" exp="Yahoo Application State Plugin"/>
+    <match name="filename" exp="npYState.dll"/>
+  </pluginItem>
+</pluginItems>
 </blocklist>

browser/app/profile/firefox.js

@@ -80,7 +80,7 @@ pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LO
 // Blocklist preferences
 pref("extensions.blocklist.enabled", true);
 pref("extensions.blocklist.interval", 86400);
-pref("extensions.blocklist.url", "https://addons.mozilla.org/blocklist/1/%APP_ID%/%APP_VERSION%/");
+pref("extensions.blocklist.url", "https://addons.mozilla.org/blocklist/2/%APP_ID%/%APP_VERSION%/%PRODUCT%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/");
 pref("extensions.blocklist.detailsURL", "http://%LOCALE%.www.mozilla.com/%LOCALE%/blocklist/");
 
 // Dictionary download preference
@@ -213,7 +213,10 @@ pref("browser.urlbar.doubleClickSelectsAll", false);
 #endif
 pref("browser.urlbar.autoFill", false);
 pref("browser.urlbar.matchOnlyTyped", false);
-pref("browser.urlbar.matchOnWordBoundary", true);
+// 0: Match anywhere (e.g., middle of words)
+// 1: Match on word boundaries and then try matching anywhere
+// 2: Match only on word boundaries (e.g., after / or .)
+pref("browser.urlbar.matchBehavior", 1);
 pref("browser.urlbar.filter.javascript", true);
 
 // the maximum number of results to show in autocomplete when doing richResults
@@ -632,7 +635,7 @@ pref("urlclassifier.gethashtables", "goog-phish-shavar,goog-malware-shavar");
 pref("urlclassifier.confirm-age", 2700);
 
 // URL for checking the reason for a malware warning.
-pref("browser.safebrowsing.malware.reportURL", "http://www.stopbadware.org/reports/container?source=@APP_UA_NAME@&version=@APP_VERSION@&reportname=");
+pref("browser.safebrowsing.malware.reportURL", "http://safebrowsing.clients.google.com/safebrowsing/diagnostic?client=%NAME%&hl=%LOCALE%&site=");
 
 #endif
 

browser/base/content/browser-menubar.inc

@@ -131,7 +131,8 @@
                           accesskey="&deleteCmd.accesskey;"
                           command="cmd_delete"/>
                 <menuseparator/>
-                <menuitem label="&selectAllCmd.label;"
+                <menuitem id="menu_selectAll"
+                          label="&selectAllCmd.label;"
                           key="key_selectAll"
                           accesskey="&selectAllCmd.accesskey;"
                           command="cmd_selectAll"/>

browser/base/content/browser-sets.inc

@@ -294,9 +294,12 @@
          command="viewHistorySidebar"/>
 
     <key id="key_fullZoomReduce"  key="&fullZoomReduceCmd.commandkey;"   command="cmd_fullZoomReduce"  modifiers="accel"/>
+    <key                          key="&fullZoomReduceCmd.commandkey2;"  command="cmd_fullZoomReduce"  modifiers="accel"/>
     <key id="key_fullZoomEnlarge" key="&fullZoomEnlargeCmd.commandkey;"  command="cmd_fullZoomEnlarge" modifiers="accel"/>
     <key                          key="&fullZoomEnlargeCmd.commandkey2;" command="cmd_fullZoomEnlarge" modifiers="accel"/>
+    <key                          key="&fullZoomEnlargeCmd.commandkey3;" command="cmd_fullZoomEnlarge" modifiers="accel"/>
     <key id="key_fullZoomReset"   key="&fullZoomResetCmd.commandkey;"    command="cmd_fullZoomReset"   modifiers="accel"/>
+    <key                          key="&fullZoomResetCmd.commandkey2;"   command="cmd_fullZoomReset"   modifiers="accel"/>
     
     <key id="key_switchTextDirection" key="&bidiSwitchTextDirectionItem.commandkey;" command="cmd_switchTextDirection" modifiers="accel,shift" />
 

browser/base/content/browser.js

@@ -2324,11 +2324,14 @@ function BrowserOnCommand(event) {
         // This is the "Why is this site blocked" button.  For malware,
         // we can fetch a site-specific report, for phishing, we redirect
         // to the generic page describing phishing protection.
+        var formatter = Cc["@mozilla.org/toolkit/URLFormatterService;1"]
+                       .getService(Components.interfaces.nsIURLFormatter);
+        
         if (/e=malwareBlocked/.test(errorDoc.documentURI)) {
           // Get the stop badware "why is this blocked" report url,
           // append the current url, and go there.
           try {
-            var reportURL = gPrefService.getCharPref("browser.safebrowsing.malware.reportURL");
+            var reportURL = formatter.formatURLPref("browser.safebrowsing.malware.reportURL");
             reportURL += errorDoc.location.href;
             content.location = reportURL;
           } catch (e) {
@@ -2337,9 +2340,7 @@ function BrowserOnCommand(event) {
         }
         else if (/e=phishingBlocked/.test(errorDoc.documentURI)) {
           try {
-            content.location = Cc["@mozilla.org/toolkit/URLFormatterService;1"]
-                              .getService(Components.interfaces.nsIURLFormatter)
-                              .formatURLPref("browser.safebrowsing.warning.infoURL");
+            content.location = formatter.formatURLPref("browser.safebrowsing.warning.infoURL");
           } catch (e) {
             Components.utils.reportError("Couldn't get phishing info URL: " + e);
           }
@@ -6562,7 +6563,9 @@ IdentityHandler.prototype = {
       // for certs that are trusted because of a security exception.
       var tooltip = this._stringBundle.getFormattedString("identity.identified.verifier",
                                                           [iData.caOrg]);
-      if (this._overrideService.hasMatchingOverride(lookupHost, iData.cert, {}, {}))
+      if (this._overrideService.hasMatchingOverride(this._lastLocation.hostname, 
+                                                    this._lastLocation.port, 
+                                                    iData.cert, {}, {}))
         tooltip = this._stringBundle.getString("identity.identified.verified_by_you");
     }
     else if (newMode == this.IDENTITY_MODE_IDENTIFIED) {

browser/base/content/browser.xul

@@ -191,7 +191,8 @@
     <!-- Popup for site identity information -->
     <panel id="identity-popup" position="after_start" hidden="true" noautofocus="true"
            onpopupshown="document.getElementById('identity-popup-more-info-button').focus();"
-           onpopuphidden="focusAndSelectUrlBar();" norestorefocus="true">
+           onpopuphidden="focusAndSelectUrlBar();" norestorefocus="true"
+           chromedir="&locale.dir;">
       <hbox id="identity-popup-container" align="top">
         <image id="identity-popup-icon"/>
         <vbox id="identity-popup-content-box">
@@ -237,7 +238,7 @@
     </vbox>
   </tooltip>
 
-  <toolbox id="navigator-toolbox" type="drag" class="toolbox-top" mode="icons"
+  <toolbox id="navigator-toolbox" class="toolbox-top" mode="icons"
            defaultmode="icons">
     <!-- Menu -->
     <toolbar type="menubar" id="toolbar-menubar" class="chromeclass-menubar" customizable="true"
@@ -321,7 +322,6 @@
                  showcommentcolumn="true"
                  showimagecolumn="true"
                  enablehistory="true"
-                 timeout="100"
                  maxrows="6"
                  newlines="stripsurroundingwhitespace"
                  oninput="URLBarOnInput(event);"
@@ -337,6 +337,7 @@
                We only add the identity-box button to the tab order when the location bar
                has focus, otherwise pressing F6 focuses it instead of the location bar -->
           <box id="identity-box" role="button"
+               chromedir="&locale.dir;"
                onclick="getIdentityHandler().handleIdentityButtonEvent(event);"
                onkeypress="getIdentityHandler().handleIdentityButtonEvent(event);">
             <hbox align="center">

browser/base/content/credits.xhtml

@@ -217,12 +217,19 @@
           <ul>
             <li>Josh Aas</li>
             <li>Robert Accettura</li>
+            <li>Ehsan Akhgari</li>
+            <li>Sean Alamares</li>
+            <li>Harvey Anderson</li>
+            <li>Smokey Ardisson</li>
+            <li>Rob Arnold</li>
             <li>Tomoya Asai</li>
             <li>Dietrich Ayala</li>
             <li>Mitchell Baker</li>
-            <li>Adam Barea</li>
+            <li>Rhian Baker</li>
+            <li>Jan Bambas</li>
             <li>Jason Barnabe</li>
             <li>David Baron</li>
+            <li>Colin Barrett</li>
             <li>Christopher Beard</li>
             <li>Glen Beasley</li>
             <li>Juan Becerra</li>
@@ -231,185 +238,229 @@
             <li>Mic Berman</li>
             <li>Uri Bernstein</li>
             <li>Christian Biesinger</li>
+            <li>Al Billings</li>
             <li>Seth Bindernagel</li>
             <li>Chris Blizzard</li>
             <li>Jamey Boje</li>
             <li>Nelson Bolyard</li>
+            <li>Marco Bonardo</li>
             <li>Carsten Book</li>
             <li>Paul Booker</li>
+            <li>Dan Born</li>
+            <li>Ondřej Brablc</li>
+            <li>Catherine Brady</li>
+            <li>Dave Bragsalla</li>
             <li>Igor Bukanov</li>
             <li>Simon Bünzli</li>
+            <li>Lapo Calamandrei</li>
+            <li>Dave Camp</li>
             <li>Rob Campbell</li>
             <li>Regis Caspar</li>
-            <li>Marco Casteleijn</li>
-            <li>Biswatosh Chakraborty</li>
+            <li>Garrett Casto</li>
             <li>Tony Chang</li>
             <li>Wan-Teh Chang</li>
+            <li>Emily Chen</li>
             <li>Ginn Chen</li>
             <li>Pascal Chevrel</li>
+            <li>Tony Chung</li>
             <li>Bob Clary</li>
             <li>Wil Clouser</li>
             <li>Mary Colvig</li>
             <li>Majken Connor</li>
             <li>Mike Connor</li>
             <li>Chris Cooper</li>
-            <li>Michael Daumling</li>
+            <li>Brian Crowder</li>
+            <li>John Daggett</li>
+            <li>Michael Davis</li>
             <li>Neil Deakin</li>
-            <li>Sherman Dickman</li>
+            <li>Julie Deroche</li>
+            <li>Justin Dolske</li>
             <li>Stephen Donner</li>
             <li>Asa Dotzler</li>
-            <li>Rafael Ebron</li>
+            <li>Chris Double</li>
             <li>Brendan Eich</li>
-            <li>Ximon Eighteen</li>
             <li>Kai Engert</li>
             <li>Steve England</li>
+            <li>Madhava Enros</li>
+            <li>Eleka Etimad</li>
+            <li>Jason Evans</li>
+            <li>Alex Faaborg</li>
+            <li>Jane Finette</li>
+            <li>Mark Finkle</li>
             <li>Darin Fisher</li>
             <li>Jayson Fittipaldi</li>
             <li>Justin Fitzhugh</li>
             <li>Ryan Flint</li>
-            <li>Justin Frankel</li>
-            <li>Simon Fraser</li>
+            <li>Alix Franquet</li>
             <li>Eli Friedman</li>
-            <li>Alex Fritze</li>
-            <li>Lisa Gansky</li>
-            <li>Mike Gao</li>
             <li>Steven Garrity</li>
-            <li>Michael Glenn</li>
-            <li>Jay Goldman</li>
-            <li>Ben Goodger</li>
+            <li>Kevin Gerich</li>
+            <li>Taras Glek</li>
+            <li>Aravind Gottipati</li>
             <li>Dão Gottwald</li>
             <li>Zak Greant</li>
-            <li>Pam Greene</li>
+            <li>Matthew Gregan</li>
             <li>Adam Guthrie</li>
-            <li>Vidar Haarr</li>
             <li>Andrei Hajdukewycz</li>
-            <li>Mark Hammond</li>
+            <li>Trevor Hardcastle</li>
             <li>Basil Hashem</li>
             <li>Ian Hayward</li>
+            <li>Ben Hearsum</li>
             <li>Axel Hecht</li>
             <li>Frank Hecker</li>
             <li>Robert Helmer</li>
             <li>Jon Hicks</li>
-            <li>Ian Hickson</li>
             <li>Graydon Hoare</li>
             <li>Chris Hofmann</li>
+            <li>Timothy Hogan</li>
+            <li>Daniel Holbert</li>
             <li>Mike Hommey</li>
-            <li>Joe Hughes</li>
-            <li>Ed Hume</li>
-            <li>Ivan Icin</li>
+            <li>Stephen Horlander</li>
+            <li>David Humphrey</li>
+            <li>Takeshi Ichimaru</li>
+            <li>Chris Ilias</li>
+            <li>Eri Inoue </li>
             <li>Joichi Ito</li>
+            <li>Laurent Jouanneau</li>
             <li>Gen Kanai</li>
+            <li>Masanori Kaneko</li>
             <li>Blake Kaplan</li>
             <li>Michael Kaply</li>
             <li>Mitch Kapor</li>
-            <li>Peter Kasting</li>
+            <li>Kazuyoshi Kato</li>
             <li>Alfred Kayser</li>
             <li>Paul Kim</li>
             <li>Masatoshi Kimura</li>
             <li>Ria Klaassen</li>
-            <li>Andrea Knight</li>
             <li>Marcia Knous</li>
-            <li>Dave Laundon</li>
+            <li>Gary Kwong</li>
+            <li>David Lanham</li>
+            <li>Edward Lee</li>
             <li>Raymond Lee</li>
+            <li>Garrett LeSage</li>
             <li>Aaron Leventhal</li>
-            <li>Mark Liddell</li>
-            <li>Dave Liebreich</li>
             <li>Anne-Julie Ligneau</li>
             <li>John Lilly</li>
             <li>Zach Lipton</li>
-            <li>Nian Liu</li>
+            <li>Kai Liu</li>
             <li>Reed Loden</li>
+            <li>Lars Lohn</li>
             <li>Robert Longson</li>
-            <li>Scott MacGregor</li>
+            <li>Bob Lord</li>
+            <li>Phil Machalski</li>
             <li>Ere Maijala</li>
             <li>Gervase Markham</li>
             <li>Sean Martell</li>
+            <li>Jim Mathies</li>
             <li>Heather Meeker</li>
             <li>Myk Melez</li>
+            <li>Federico Mena-Quintero</li>
             <li>Mark Mentovai</li>
-            <li>Alex Menzies</li>
             <li>Steven Michaud</li>
+            <li>Ted Mielczarek</li>
             <li>Bernd Mielke</li>
-            <li>Joey Minta</li>
+            <li>Dave Miller</li>
+            <li>Dan Mills</li>
+            <li>Michael Monreal</li>
             <li>Simon Montagu</li>
             <li>Mike Morgan</li>
-            <li>Scooter Morris</li>
+            <li>Dan Mosedale</li>
+            <li>Michael Moy</li>
             <li>Masayuki Nakano</li>
             <li>Marria Nazif</li>
-            <li>Ian Neal</li>
+            <li>Kev Needham</li>
             <li>Kaori Negoro</li>
+            <li>Johnathan Nightingale</li>
+            <li>Andreas Nilsson</li>
             <li>Tristan Nitot</li>
             <li>Alice Nodelman</li>
+            <li>Michal Novotny</li>
             <li>Robert O'Callahan</li>
+            <li>John O'Duinn</li>
+            <li>Jan Odvárko</li>
+            <li>Tomoyuki Okazaki</li>
+            <li>Jeremy Orem</li>
+            <li>Hideo Oshima</li>
             <li>Mats Palmgren</li>
             <li>Stuart Parmenter</li>
             <li>Jay Patel</li>
-            <li>Igor Pavlov</li>
+            <li>Chris Pearce</li>
             <li>Javier Pedemonte</li>
             <li>Alfred Peng</li>
             <li>Christian Persch</li>
+            <li>Kalle Persson</li>
+            <li>Ulisse Perusin</li>
             <li>Olli Pettay</li>
-            <li>Chase Phillips</li>
             <li>Julien Pierre</li>
-            <li>Mark Pilgrim</li>
-            <li>Mike Pinkerton</li>
             <li>Alex Polvi</li>
             <li>Nickolay Ponomarev</li>
+            <li>Dan Portillo</li>
             <li>Karen Prescott</li>
-            <li>Feng Qian</li>
-            <li>Robert Rainwater</li>
-            <li>Brian Rakowski</li>
+            <li>Florian Quèze</li>
             <li>Neil Rashbrook</li>
+            <li>Bret Reckard</li>
             <li>J. Paul Reed</li>
             <li>Robert Relyea</li>
+            <li>John Resig</li>
             <li>Deb Richardson</li>
             <li>Tim Riley</li>
             <li>Phil Ringnalda</li>
+            <li>Julien Rivaud</li>
             <li>David Rolnitzky</li>
             <li>Asaf Romano</li>
-            <li>Doron Rosenberg</li>
-            <li>Blake Ross</li>
-            <li>James Ross</li>
             <li>Tim Rowley</li>
-            <li>Cameron Roy</li>
             <li>Jesse Ruderman</li>
             <li>Brian Ryner</li>
             <li>Alexander Sack</li>
             <li>Hideo Saito</li>
+            <li>Eiko Sakuma</li>
             <li>Ken Saunders</li>
             <li>Robert Sayre</li>
-            <li>Fritz Schneider</li>
             <li>Mike Schroepfer</li>
-            <li>Phil Schwan</li>
+            <li>Kurt Schultz</li>
             <li>Justin Scott</li>
-            <li>Chris Seawood</li>
-            <li>Leon Sha</li>
+            <li>Hiroshi Sekiya</li>
+            <li>Tara Shahian</li>
+            <li>Melissa Shapiro</li>
             <li>Gavin Sharp</li>
             <li>Mike Shaver</li>
             <li>Eric Shepherd</li>
-            <li>Hiroshi Shimoda</li>
+            <li>Atsushi Shimono</li>
             <li>Jungshik Shin</li>
             <li>Jonas Sicking</li>
+            <li>Damon Sicore</li>
             <li>Roger B. Sidje</li>
+            <li>Samuel Sidler</li>
+            <li>Henrik Skupin</li>
+            <li>John Slater</li>
             <li>Benjamin Smedberg</li>
-            <li>Jon Smirl</li>
+            <li>Andrew Smith</li>
+            <li>Mark Smith</li>
+            <li>Window Snyder</li>
             <li>Josh Soref</li>
+            <li>Ian Spence</li>
             <li>Seth Spitzer</li>
+            <li>Markus Stange</li>
+            <li>Jakub Steiner</li>
             <li>Johnny Stenback</li>
-            <li>Luke Stone</li>
+            <li>Brandon Sterne</li>
             <li>Robert Strong</li>
-            <li>Annie Sullivan</li>
-            <li>Amir Szekely</li>
-            <li>Dave Townsend</li>
+            <li>Vicky Sun</li>
+            <li>Clint Talbert</li>
+            <li>David Tenser</li>
             <li>Chris Thomas</li>
+            <li>Nick Thomas</li>
+            <li>Laura Thomson</li>
+            <li>Karl Tomlinson</li>
+            <li>Dave Townsend</li>
             <li>Ben Turner</li>
             <li>Doug Turner</li>
             <li>Peter Van der Beken</li>
             <li>Peter van der Woude</li>
+            <li>Teune van Steeg</li>
+            <li>Ryan VanderMeulen</li>
             <li>Daniel Veditz</li>
             <li>Michael Ventnor</li>
-            <li>Joost Verburg</li>
-            <li>Jorge Villalobos</li>
             <li>Alexei Volkov</li>
             <li>Vladimir Vukicevic</li>
             <li>Håkan Waara</li>
@@ -417,12 +468,19 @@
             <li>Tracy Walker</li>
             <li>Martijn Wargers</li>
             <li>Jonathan Watt</li>
+            <li>Frédéric Wenzel</li>
             <li>Steffen Wilberg</li>
-            <li>Brett Wilson</li>
+            <li>Shawn Wilsher</li>
+            <li>Dan Witte</li>
+            <li>Steve Won</li>
             <li>Michael Wu</li>
+            <li>Masahiro Yamada</li>
             <li>Satoko Takita Yamaguchi (Chibi)</li>
+            <li>Christine Yen</li>
             <li>Kohei Yoshino</li>
+            <li>Shigeru Yoshitake</li>
             <li>Boris Zbarsky</li>
+            <li>Matthew Zeier</li>
           </ul>
 
           &credit.translation;

browser/base/content/downloadManagerOverlay.xul

@@ -46,11 +46,16 @@
 #include browserMountPoints.inc
 
 <script type="application/javascript"><![CDATA[
-  // Bug 405696: Map Edit->Find command to the download manger's command
   window.addEventListener("load", function(event) {
+    // Bug 405696: Map Edit -> Find command to the download manager's command
     var findMenuItem = document.getElementById("menu_find");
     findMenuItem.setAttribute("command", "cmd_findDownload");
     findMenuItem.setAttribute("key", "key_findDownload");
+
+    // Bug 429614: Map Edit -> Select All command to download manager's command
+    let selectAllMenuItem = document.getElementById("menu_selectAll");
+    selectAllMenuItem.setAttribute("command", "cmd_selectAllDownloads");
+    selectAllMenuItem.setAttribute("key", "key_selectAllDownloads");
   }, false);
 ]]></script>
 

browser/base/content/overrides/app-license.html

@@ -2,4 +2,4 @@
     <a href="http://www.mozilla.com/">Mozilla Corporation</a> 
     are made available under 
     <a href="http://www.mozilla.org/foundation/EULA/">the corresponding 
-    EULA</a>.
+    EULA</a>.</p>

browser/base/content/test/Makefile.in

@@ -60,6 +60,11 @@ _BROWSER_FILES = browser_bug321000.js \
                  browser_getshortcutoruri.js \
     $(NULL)
 
+ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+_BROWSER_FILES += browser_customize.js \
+    $(NULL)
+endif
+
 # disable tests on linux for now..
 ifneq ($(OS_ARCH),Linux)
 _BROWSER_FILES += \

browser/base/content/test/browser_customize.js

@@ -0,0 +1,38 @@
+function test()
+{
+  waitForExplicitFinish();
+  var panel = document.getElementById("customizeToolbarSheetPopup");
+  panel.addEventListener("popupshown", testCustomizePopupShown, false);
+  document.getElementById("cmd_CustomizeToolbars").doCommand();
+}
+
+function testCustomizePopupShown()
+{
+  var panel = document.getElementById("customizeToolbarSheetPopup");
+  panel.removeEventListener("popupshown", testCustomizePopupShown, false);
+  panel.addEventListener("popuphidden", testCustomizePopupHidden, false);
+
+  var frame = document.getElementById("customizeToolbarSheetIFrame").contentDocument;
+  frame.addEventListener("load", testCustomizeFrameLoaded, true);
+}
+
+function testCustomizeFrameLoaded()
+{
+  var frame = document.getElementById("customizeToolbarSheetIFrame");
+  frame.removeEventListener("load", testCustomizeFrameLoaded, true);
+
+  var menu = document.getElementById("bookmarksMenuPopup");
+  ok("getResult" in menu, "menu has binding");
+
+  var framedoc = document.getElementById("customizeToolbarSheetIFrame").contentDocument;
+  var b = framedoc.getElementById("donebutton");
+
+  framedoc.getElementById("donebutton").doCommand();
+}
+  
+function testCustomizePopupHidden()
+{
+  var panel = document.getElementById("customizeToolbarSheetPopup");
+  panel.removeEventListener("popuphidden", testCustomizePopupHidden, false);
+  finish();
+}

browser/base/content/utilityOverlay.js

@@ -204,12 +204,34 @@ function openUILinkIn( url, where, allowThirdPartyFixup, postData, referrerUrl )
     saveURL(url, null, null, true, null, referrerUrl);
     return;
   }
+  const Cc = Components.classes;
+  const Ci = Components.interfaces;
 
   var w = getTopWin();
 
   if (!w || where == "window") {
-    openDialog(getBrowserURL(), "_blank", "chrome,all,dialog=no", url,
-               null, referrerUrl, postData, allowThirdPartyFixup);
+    var sa = Cc["@mozilla.org/supports-array;1"].
+             createInstance(Ci.nsISupportsArray);
+
+    var wuri = Cc["@mozilla.org/supports-string;1"].
+               createInstance(Ci.nsISupportsString);
+    wuri.data = url;
+
+    sa.AppendElement(wuri);
+    sa.AppendElement(null);
+    sa.AppendElement(referrerUrl);
+    sa.AppendElement(postData);
+    sa.AppendElement(allowThirdPartyFixup);
+
+    var ww = Cc["@mozilla.org/embedcomp/window-watcher;1"].
+             getService(Ci.nsIWindowWatcher);
+
+    ww.openWindow(w || window,
+                  getBrowserURL(),
+                  null,
+                  "chrome,dialog=no,all",
+                  sa);
+
     return;
   }
 

browser/components/migration/src/nsSeamonkeyProfileMigrator.cpp

@@ -50,6 +50,7 @@
 #include "nsNetUtil.h"
 #include "nsSeamonkeyProfileMigrator.h"
 #include "nsVoidArray.h"
+#include "nsIProfileMigrator.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 // nsSeamonkeyProfileMigrator
@@ -103,6 +104,15 @@ nsSeamonkeyProfileMigrator::Migrate(PRUint16 aItems, nsIProfileStartup* aStartup
   COPY_DATA(CopyHistory,      aReplace, nsIBrowserProfileMigrator::HISTORY);
   COPY_DATA(CopyPasswords,    aReplace, nsIBrowserProfileMigrator::PASSWORDS);
   COPY_DATA(CopyOtherData,    aReplace, nsIBrowserProfileMigrator::OTHERDATA);
+
+  // Need to do startup before trying to copy bookmarks, since bookmarks
+  // import requires a profile. Can't do it earlier because services might
+  // end up creating the files we try to copy above.
+  if (aStartup) {
+    rv = aStartup->DoStartup();
+    NS_ENSURE_SUCCESS(rv, rv);
+  }
+
   COPY_DATA(CopyBookmarks,    aReplace, nsIBrowserProfileMigrator::BOOKMARKS);
 
   if (aReplace && 
@@ -724,10 +734,25 @@ nsresult
 nsSeamonkeyProfileMigrator::CopyBookmarks(PRBool aReplace)
 {
   if (aReplace) {
+    // Initialize the default bookmarks
     nsresult rv = InitializeBookmarks(mTargetProfile);
     NS_ENSURE_SUCCESS(rv, rv);
-    return CopyFile(FILE_NAME_BOOKMARKS, FILE_NAME_BOOKMARKS);
+
+    // Merge in the bookmarks from the source profile
+    nsCOMPtr<nsIFile> sourceFile;
+    mSourceProfile->Clone(getter_AddRefs(sourceFile));
+    sourceFile->Append(FILE_NAME_BOOKMARKS);
+    rv = ImportBookmarksHTML(sourceFile, PR_TRUE, PR_FALSE, EmptyString().get());
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    // we need to set this pref so that on startup
+    // we don't blow away what we just imported
+    nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID, &rv));
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    return pref->SetBoolPref("browser.places.importBookmarksHTML", PR_FALSE);
   }
+
   return ImportNetscapeBookmarks(FILE_NAME_BOOKMARKS, 
                                  NS_LITERAL_STRING("sourceNameSeamonkey").get());
 }

browser/components/nsBrowserGlue.js

@@ -467,12 +467,14 @@ BrowserGlue.prototype = {
           var importer = Cc["@mozilla.org/browser/places/import-export-service;1"].
                          getService(Ci.nsIPlacesImportExportService);
           importer.importHTMLFromFile(bookmarksFile, true /* overwrite existing */);
-        } finally {
-          prefBranch.setBoolPref("browser.places.importBookmarksHTML", false);
-          if (restoreDefaultBookmarks)
-            prefBranch.setBoolPref("browser.bookmarks.restore_default_bookmarks",
-                                   false);
+        } catch (err) {
+          // Report the error, but ignore it.
+          Cu.reportError(err);
         }
+        prefBranch.setBoolPref("browser.places.importBookmarksHTML", false);
+        if (restoreDefaultBookmarks)
+          prefBranch.setBoolPref("browser.bookmarks.restore_default_bookmarks",
+                                 false);
       }
     }
 

browser/components/places/content/bookmarkProperties.js

@@ -22,6 +22,7 @@
  *   Joe Hughes <jhughes@google.com>
  *   Dietrich Ayala <dietrich@mozilla.com>
  *   Asaf Romano <mano@mozilla.com>
+ *   Marco Bonardo <mak77@supereva.it>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -70,9 +71,9 @@
  *     - "edit" - for editing a bookmark item or a folder.
  *       @ type (String). Possible values:
  *         - "bookmark"
- *           @ bookmarkId (Integer) - the id of the bookmark item.
+ *           @ itemId (Integer) - the id of the bookmark item.
  *         - "folder" (also applies to livemarks)
- *           @ folderId (Integer) - the id of the folder.
+ *           @ itemId (Integer) - the id of the folder.
  *   @ hiddenRows (Strings array) - optional, list of rows to be hidden
  *     regardless of the item edited or added by the dialog.
  *     Possible values:
@@ -80,7 +81,7 @@
  *     - "location"
  *     - "description"
  *     - "keyword"
- *     - "load in sidebar"
+ *     - "loadInSidebar"
  *     - "feedURI"
  *     - "siteURI"
  *     - "folder picker" - hides both the tree and the menu.
@@ -115,9 +116,8 @@ var BookmarkPropertiesPanel = {
 
   _action: null,
   _itemType: null,
-  _folderId: null,
-  _bookmarkId: -1,
-  _bookmarkURI: null,
+  _itemId: -1,
+  _uri: null,
   _loadBookmarkInSidebar: false,
   _itemTitle: "",
   _itemDescription: "",
@@ -201,14 +201,14 @@ var BookmarkPropertiesPanel = {
           if ("uri" in dialogInfo) {
             NS_ASSERT(dialogInfo.uri instanceof Ci.nsIURI,
                       "uri property should be a uri object");
-            this._bookmarkURI = dialogInfo.uri;
+            this._uri = dialogInfo.uri;
           }
           if (typeof(this._itemTitle) != "string") {
-            if (this._bookmarkURI) {
+            if (this._uri) {
               this._itemTitle =
-                this._getURITitleFromHistory(this._bookmarkURI);
+                this._getURITitleFromHistory(this._uri);
               if (!this._itemTitle)
-                this._itemTitle = this._bookmarkURI.spec;
+                this._itemTitle = this._uri.spec;
             }
             else
               this._itemTitle = this._strings.getString("newBookmarkDefault");
@@ -268,47 +268,45 @@ var BookmarkPropertiesPanel = {
 
       switch (dialogInfo.type) {
         case "bookmark":
-          NS_ASSERT("bookmarkId" in dialogInfo);
+          NS_ASSERT("itemId" in dialogInfo);
 
           this._action = ACTION_EDIT;
           this._itemType = BOOKMARK_ITEM;
-          this._bookmarkId = dialogInfo.bookmarkId;
+          this._itemId = dialogInfo.itemId;
 
-          this._bookmarkURI = bookmarks.getBookmarkURI(this._bookmarkId);
-          this._itemTitle = bookmarks.getItemTitle(this._bookmarkId);
+          this._uri = bookmarks.getBookmarkURI(this._itemId);
+          this._itemTitle = bookmarks.getItemTitle(this._itemId);
 
           // keyword
           this._bookmarkKeyword =
-            bookmarks.getKeywordForBookmark(this._bookmarkId);
+            bookmarks.getKeywordForBookmark(this._itemId);
 
           // Load In Sidebar
           this._loadBookmarkInSidebar =
-            annos.itemHasAnnotation(this._bookmarkId, LOAD_IN_SIDEBAR_ANNO);
+            annos.itemHasAnnotation(this._itemId, LOAD_IN_SIDEBAR_ANNO);
 
           break;
         case "folder":
-          NS_ASSERT("folderId" in dialogInfo);
+          NS_ASSERT("itemId" in dialogInfo);
 
           this._action = ACTION_EDIT;
-          this._folderId = dialogInfo.folderId;
+          this._itemId = dialogInfo.itemId;
 
           const livemarks = PlacesUtils.livemarks;
-          if (livemarks.isLivemark(this._folderId)) {
+          if (livemarks.isLivemark(this._itemId)) {
             this._itemType = LIVEMARK_CONTAINER;
-            this._feedURI = livemarks.getFeedURI(this._folderId);
-            this._siteURI = livemarks.getSiteURI(this._folderId);
+            this._feedURI = livemarks.getFeedURI(this._itemId);
+            this._siteURI = livemarks.getSiteURI(this._itemId);
           }
           else
             this._itemType = BOOKMARK_FOLDER;
-          this._itemTitle = bookmarks.getItemTitle(this._folderId);
+          this._itemTitle = bookmarks.getItemTitle(this._itemId);
           break;
       }
 
       // Description
-      // XXXmano: unify the two id fields
-      var itemId = dialogInfo.type == "bookmark" ? this._bookmarkId : this._folderId;
-      if (annos.itemHasAnnotation(itemId, DESCRIPTION_ANNO)) {
-        this._itemDescription = annos.getItemAnnotation(itemId,
+      if (annos.itemHasAnnotation(this._itemId, DESCRIPTION_ANNO)) {
+        this._itemDescription = annos.getItemAnnotation(this._itemId,
                                                         DESCRIPTION_ANNO);
       }
     }
@@ -339,7 +337,6 @@ var BookmarkPropertiesPanel = {
   onDialogLoad: function BPP_onDialogLoad() {
     this._determineItemInfo();
     this._populateProperties();
-    this._forceHideRows();
     this.validateChanges();
 
     this._folderMenuList = this._element("folderMenuList");
@@ -453,30 +450,34 @@ var BookmarkPropertiesPanel = {
   },
 
   /**
-   * Hides fields which were explicitly set hidden by the the dialog opener
-   * (see documentation at the top of this file).
+   * Show or hides fields based on item type.
    */
-  _forceHideRows: function BPP__forceHideRows() {
-    var hiddenRows = window.arguments[0].hiddenRows;
-    if (!hiddenRows)
-      return;
+  _showHideRows: function BPP__showHideRows() {
+    var hiddenRows = window.arguments[0].hiddenRows || new Array();
 
-    if (hiddenRows.indexOf("title") != -1)
-      this._element("namePicker").hidden = true;
-    if (hiddenRows.indexOf("location") != -1)
-      this._element("locationRow").hidden = true;
-    if (hiddenRows.indexOf("keyword") != -1)
-      this._element("keywordRow").hidden = true;
-    if (hiddenRows.indexOf("description")!= -1)
-      this._element("descriptionRow").hidden = true;
-    if (hiddenRows.indexOf("folder picker") != -1)
-      this._element("folderRow").hidden = true;
-    if (hiddenRows.indexOf("feedURI") != -1)
-      this._element("livemarkFeedLocationRow").hidden = true;
-    if (hiddenRows.indexOf("siteURI") != -1)
-      this._element("livemarkSiteLocationRow").hidden = true;
-    if (hiddenRows.indexOf("load in sidebar") != -1)
-      this._element("loadInSidebarCheckbox").hidden = true;
+    var isBookmark = this._itemType == BOOKMARK_ITEM;
+    var isLivemark = this._itemType == LIVEMARK_CONTAINER;
+
+    var isQuery = false;
+    if (this._uri)
+      isQuery = this._uri.schemeIs("place");
+
+    this._element("namePicker").hidden =
+      hiddenRows.indexOf("title") != -1;
+    this._element("locationRow").hidden =
+      hiddenRows.indexOf("location") != -1 || isQuery || !isBookmark;
+    this._element("keywordRow").hidden =
+      hiddenRows.indexOf("location") != -1 || isQuery || !isBookmark;
+    this._element("descriptionRow").hidden =
+      hiddenRows.indexOf("description")!= -1
+    this._element("folderRow").hidden =
+      hiddenRows.indexOf("folder picker") != -1 || this._action == ACTION_EDIT;
+    this._element("livemarkFeedLocationRow").hidden =
+      hiddenRows.indexOf("feedURI") != -1 || !isLivemark;
+    this._element("livemarkSiteLocationRow").hidden =
+      hiddenRows.indexOf("siteURI") != -1 || !isLivemark;
+    this._element("loadInSidebarCheckbox").hidden =
+      hiddenRows.indexOf("loadInSidebar") != -1 || isQuery || !isBookmark;
   },
 
   /**
@@ -490,8 +491,8 @@ var BookmarkPropertiesPanel = {
     this._element("descriptionTextfield").value = this._itemDescription;
 
     if (this._itemType == BOOKMARK_ITEM) {
-      if (this._bookmarkURI)
-        this._element("editURLBar").value = this._bookmarkURI.spec;
+      if (this._uri)
+        this._element("editURLBar").value = this._uri.spec;
 
       if (typeof(this._bookmarkKeyword) == "string")
         this._element("keywordTextfield").value = this._bookmarkKeyword;
@@ -499,11 +500,6 @@ var BookmarkPropertiesPanel = {
       if (this._loadBookmarkInSidebar)
         this._element("loadInSidebarCheckbox").checked = true;
     }
-    else {
-      this._element("locationRow").hidden = true;
-      this._element("keywordRow").hidden = true;
-      this._element("loadInSidebarCheckbox").hidden = true;
-    }
 
     if (this._itemType == LIVEMARK_CONTAINER) {
       if (this._feedURI)
@@ -511,13 +507,8 @@ var BookmarkPropertiesPanel = {
       if (this._siteURI)
         this._element("feedSiteLocationTextfield").value = this._siteURI.spec;
     }
-    else {
-      this._element("livemarkFeedLocationRow").hidden = true;
-      this._element("livemarkSiteLocationRow").hidden = true;
-    }
 
-    if (this._action == ACTION_EDIT)
-      this._element("folderRow").hidden = true;
+    this._showHideRows();
   },
 
   _createMicrosummaryMenuItem:
@@ -554,15 +545,15 @@ var BookmarkPropertiesPanel = {
     var namePicker = this._element("namePicker");
     const annos = PlacesUtils.annotations;
 
-    if (annos.itemHasAnnotation(this._bookmarkId, STATIC_TITLE_ANNO)) {
-      userEnteredNameField.label = annos.getItemAnnotation(this._bookmarkId,
+    if (annos.itemHasAnnotation(this._itemId, STATIC_TITLE_ANNO)) {
+      userEnteredNameField.label = annos.getItemAnnotation(this._itemId,
                                                            STATIC_TITLE_ANNO);
     }
     else
       userEnteredNameField.label = this._itemTitle;
 
     // Non-bookmark items always use the item-title itself
-    if (this._itemType != BOOKMARK_ITEM || !this._bookmarkURI) {
+    if (this._itemType != BOOKMARK_ITEM || !this._uri) {
       namePicker.selectedItem = userEnteredNameField;
       return;
     }
@@ -570,8 +561,8 @@ var BookmarkPropertiesPanel = {
     var itemToSelect = userEnteredNameField;
     try {
       this._microsummaries =
-        PlacesUIUtils.microsummaries.getMicrosummaries(this._bookmarkURI,
-                                                       this._bookmarkId);
+        PlacesUIUtils.microsummaries.getMicrosummaries(this._uri,
+                                                       this._itemId);
     }
     catch(ex) {
       // getMicrosummaries will throw an exception if the page to which the URI
@@ -594,7 +585,7 @@ var BookmarkPropertiesPanel = {
 
           if (this._action == ACTION_EDIT &&
               PlacesUIUtils.microsummaries
-                           .isMicrosummary(this._bookmarkId, microsummary))
+                           .isMicrosummary(this._itemId, microsummary))
             itemToSelect = menuItem;
 
           menupopup.appendChild(menuItem);
@@ -800,11 +791,7 @@ var BookmarkPropertiesPanel = {
    * was open.
    */
   _saveChanges: function BPP__saveChanges() {
-    var itemId;
-    if (this._itemType == BOOKMARK_ITEM)
-      itemId = this._bookmarkId;
-    else
-      itemId = this._folderId;
+    var itemId = this._itemId;
 
     var transactions = [];
 
@@ -824,7 +811,7 @@ var BookmarkPropertiesPanel = {
     if (this._itemType == BOOKMARK_ITEM) {
       // location
       var url = PlacesUIUtils.createFixedURI(this._element("editURLBar").value);
-      if (!this._bookmarkURI.equals(url))
+      if (!this._uri.equals(url))
         transactions.push(PlacesUIUtils.ptm.editBookmarkURI(itemId, url));
 
       // keyword transactions
@@ -864,7 +851,7 @@ var BookmarkPropertiesPanel = {
       var feedURI = PlacesUIUtils.createFixedURI(feedURIString);
       if (!this._feedURI.equals(feedURI)) {
         transactions.push(
-          PlacesUIUtils.ptm.editLivemarkFeedURI(this._folderId, feedURI));
+          PlacesUIUtils.ptm.editLivemarkFeedURI(this._itemId, feedURI));
       }
 
       // Site Location is empty, we can set its URI to null
@@ -876,7 +863,7 @@ var BookmarkPropertiesPanel = {
       if ((!newSiteURI && this._siteURI)  ||
           (newSiteURI && (!this._siteURI || !this._siteURI.equals(newSiteURI)))) {
         transactions.push(
-          PlacesUIUtils.ptm.editLivemarkSiteURI(this._folderId, newSiteURI));
+          PlacesUIUtils.ptm.editLivemarkSiteURI(this._itemId, newSiteURI));
       }
     }
 
@@ -940,7 +927,7 @@ var BookmarkPropertiesPanel = {
     }
 
     if (this._charSet)
-      PlacesUtils.history.setCharsetForURI(this._bookmarkURI, this._charSet);
+      PlacesUtils.history.setCharsetForURI(this._uri, this._charSet);
 
     var transactions = [PlacesUIUtils.ptm.createItem(uri, aContainer, aIndex,
                                                      title, keyword,
@@ -1111,14 +1098,8 @@ var BookmarkPropertiesPanel = {
     if (!selectedNode)
       return;
 
-    var folderId = selectedNode.itemId;
-    // Don't set the selected item if the static item for the folder is
-    // already selected
-    var oldSelectedItem = this._folderMenuList.selectedItem;
-    if ((oldSelectedItem.id == "toolbarFolderItem" &&
-         folderId == PlacesUtils.toolbarFolderId) ||
-        (oldSelectedItem.id == "bookmarksRootItem" &&
-         folderId == PlacesUtils.bookmarksMenuFolderId))
+    var folderId = PlacesUtils.getConcreteItemId(selectedNode);
+    if (this._getFolderIdFromMenuList() == folderId)
       return;
 
     var folderItem = this._getFolderMenuItem(folderId);

browser/components/places/content/controller.js

@@ -77,16 +77,33 @@ const REMOVE_PAGES_MAX_SINGLEREMOVES = 10;
  *          is provided for informational purposes only!
  * @param   [optional] aIsTag
  *          Indicates if parent container is a tag
+ * @param   [optional] aDropNearItemId
+ *          When defined we will calculate index based on this itemId
  * @constructor
  */
-function InsertionPoint(aItemId, aIndex, aOrientation, aIsTag) {
+function InsertionPoint(aItemId, aIndex, aOrientation, aIsTag,
+                        aDropNearItemId) {
   this.itemId = aItemId;
-  this.index = aIndex;
+  this._index = aIndex;
   this.orientation = aOrientation;
   this.isTag = aIsTag;
+  this.dropNearItemId = aDropNearItemId;
 }
-InsertionPoint.prototype.toString = function IP_toString() {
-  return "[object InsertionPoint(folder:" + this.itemId + ",index:" + this.index + ",orientation:" + this.orientation + ",isTag:" + this.isTag + ")]";
+
+InsertionPoint.prototype = {
+  set index(val) {
+    return this._index = val;
+  },
+
+  get index() {
+    if (this.dropNearItemId > 0) {
+      // If dropNearItemId is set up we must calculate the real index of
+      // the item near which we will drop.
+      var index = PlacesUtils.bookmarks.getItemIndex(this.dropNearItemId);
+      return this.orientation == Ci.nsITreeView.DROP_BEFORE ? index : index + 1;
+    }
+    return this._index;
+  }
 };
 
 /**
@@ -147,6 +164,8 @@ PlacesController.prototype = {
       var selectedNode = this._view.selectedNode;
       if (selectedNode) {
         if (PlacesUtils.nodeIsFolder(selectedNode) ||
+            (PlacesUtils.nodeIsQuery(selectedNode) &&
+             selectedNode.itemId != -1) ||
             (PlacesUtils.nodeIsBookmark(selectedNode) &&
             !PlacesUtils.nodeIsLivemarkItem(selectedNode)))
           return true;
@@ -264,9 +283,9 @@ PlacesController.prototype = {
    * is a policy decision that a removable item not be placed inside a non-
    * removable item.
    * @param aIsMoveCommand
-   *        True if thecommand for which this method is called only moves the
+   *        True if the command for which this method is called only moves the
    *        selected items to another container, false otherwise.
-   * @returns true if the there's a selection which has no nodes that cannot be removed,
+   * @returns true if all nodes in the selection can be removed,
    *          false otherwise.
    */
   _hasRemovableSelection: function PC__hasRemovableSelection(aIsMoveCommand) {
@@ -278,17 +297,8 @@ PlacesController.prototype = {
       if (nodes[i] == root)
         return false;
 
-      // Disallow removing shortcuts from the left pane
-      var nodeItemId = nodes[i].itemId;
-      if (PlacesUtils.annotations
-                     .itemHasAnnotation(nodeItemId, ORGANIZER_QUERY_ANNO))
-        return false;
-
-      // Disallow removing the toolbar, menu and unfiled-bookmarks folders
-      if (!aIsMoveCommand &&
-           (nodeItemId == PlacesUtils.toolbarFolderId ||
-            nodeItemId == PlacesUtils.unfiledBookmarksFolderId ||
-            nodeItemId == PlacesUtils.bookmarksMenuFolderId))
+      if (PlacesUtils.nodeIsFolder(nodes[i]) &&
+          !PlacesControllerDragHelper.canMoveContainerNode(nodes[i]))
         return false;
 
       // We don't call nodeIsReadOnly here, because nodeIsReadOnly means that
@@ -383,13 +393,13 @@ PlacesController.prototype = {
    *    "link"              node is a URI
    *    "bookmark"          node is a bookamrk
    *    "livemarkChild"     node is a child of a livemark
+   *    "tagChild"          node is a child of a tag
    *    "folder"            node is a folder
    *    "query"             node is a query
    *    "dynamiccontainer"  node is a dynamic container
    *    "separator"         node is a separator line
    *    "host"              node is a host
-   *    "mutable"           node can have items inserted or reordered
-   *    
+   *
    * @returns an array of objects corresponding the selected nodes. Each
    *          object has each of the properties above set if its corresponding
    *          node matches the rule. In addition, the annotations names for each 
@@ -446,25 +456,22 @@ PlacesController.prototype = {
           uri = PlacesUtils._uri(node.uri);
           if (PlacesUtils.nodeIsBookmark(node)) {
             nodeData["bookmark"] = true;
+            PlacesUtils.nodeIsTagQuery(node.parent)
             var mss = PlacesUIUtils.microsummaries;
             if (mss.hasMicrosummary(node.itemId))
               nodeData["microsummary"] = true;
-            else if (node.parent &&
-                     PlacesUtils.nodeIsLivemarkContainer(node.parent))
-              nodeData["livemarkChild"] = true;
+
+            var parentNode = node.parent;
+            if (parentNode) {
+              if (PlacesUtils.nodeIsTagQuery(parentNode))
+                nodeData["tagChild"] = true;
+              else if (PlacesUtils.nodeIsLivemarkContainer(parentNode))
+                nodeData["livemarkChild"] = true;
+            }
           }
           break;
       }
 
-      // Mutability is whether or not a container can have selected items
-      // inserted or reordered. It does _not_ dictate whether or not the 
-      // container can have items removed from it, since some containers that
-      // aren't  reorderable can have items removed from them, e.g. a history
-      // list. 
-      if (!PlacesUtils.nodeIsReadOnly(node) &&
-          !PlacesUtils.isReadonlyFolder(node.parent || root))
-        nodeData["mutable"] = true;
-
       // annotations
       if (uri) {
         var names = PlacesUtils.annotations.getPageAnnotationNames(uri, {});
@@ -509,8 +516,12 @@ PlacesController.prototype = {
       }
     }
 
-    if (aMenuItem.hasAttribute("selection")) {
-      var showRules = aMenuItem.getAttribute("selection").split("|");
+    var selectionAttr = aMenuItem.getAttribute("selection");
+    if (selectionAttr) {
+      if (selectionAttr == "any")
+        return true;
+
+      var showRules = selectionAttr.split("|");
       var anyMatched = false;
       function metaDataNodeMatches(metaDataNode, rules) {
         for (var i=0; i < rules.length; i++) {
@@ -553,9 +564,11 @@ PlacesController.prototype = {
    *     selection attribute. A menu-item would be hidden if at least one of the
    *     given rules apply to one of the selected nodes. The rules should be
    *     separated with the | character.
-   *  5) The visibility state of a menu-item is unchanged if none of these
+   *  5) The "hideifnoinsetionpoint" attribute may be set on a menu-item to
+   *     true if it should be hidden when there's no insertion point
+   *  6) The visibility state of a menu-item is unchanged if none of these
    *     attribute are set.
-   *  6) These attributes should not be set on separators for which the
+   *  7) These attributes should not be set on separators for which the
    *     visibility state is "auto-detected."
    * @param   aPopup
    *          The menupopup to build children into.
@@ -563,6 +576,8 @@ PlacesController.prototype = {
    */
   buildContextMenu: function PC_buildContextMenu(aPopup) {
     var metadata = this._buildSelectionMetadata();
+    var ip = this._view.insertionPoint;
+    var noIp = !ip || ip.isTag;
 
     var separator = null;
     var visibleItemsBeforeSep = false;
@@ -570,7 +585,9 @@ PlacesController.prototype = {
     for (var i = 0; i < aPopup.childNodes.length; ++i) {
       var item = aPopup.childNodes[i];
       if (item.localName != "menuseparator") {
-        item.hidden = !this._shouldShowMenuItem(item, metadata);
+        item.hidden = (item.getAttribute("hideifnoinsetionpoint") == "true" && noIp) ||
+                      !this._shouldShowMenuItem(item, metadata);
+
         if (!item.hidden) {
           visibleItemsBeforeSep = true;
           anyVisible = true;
@@ -631,9 +648,10 @@ PlacesController.prototype = {
       return;
 
     if (PlacesUtils.nodeIsFolder(node))
-      PlacesUIUtils.showFolderProperties(node.itemId);
-    else if (PlacesUtils.nodeIsBookmark(node))
-      PlacesUIUtils.showBookmarkProperties(node.itemId);
+      PlacesUIUtils.showItemProperties(node.itemId, "folder");
+    else if (PlacesUtils.nodeIsBookmark(node) ||
+             PlacesUtils.nodeIsQuery(node))
+      PlacesUIUtils.showItemProperties(node.itemId, "bookmark");
   },
 
   /**
@@ -866,6 +884,15 @@ PlacesController.prototype = {
         transactions.push(PlacesUIUtils.ptm.untagURI(uri, [tagItemId]));
         continue;
       }
+      else if (PlacesUtils.nodeIsQuery(node.parent) &&
+               asQuery(node.parent).queryOptions.queryType ==
+                Ci.nsINavHistoryQueryOptions.QUERY_TYPE_HISTORY &&
+               node.uri) {
+        // remove page from history, history deletes are not undoable
+        var bhist = PlacesUtils.history.QueryInterface(Ci.nsIBrowserHistory);
+        bhist.removePage(PlacesUtils._uri(node.uri));
+        continue;
+      }
 
       transactions.push(PlacesUIUtils.ptm.removeItem(node.itemId));
     }
@@ -990,6 +1017,7 @@ PlacesController.prototype = {
    *          elsewhere.
    */
   getTransferData: function PC_getTransferData(dragAction) {
+    var copy = dragAction == Ci.nsIDragService.DRAGDROP_ACTION_COPY;
     var result = this._view.getResult();
     var oldViewer = result.viewer;
     try {
@@ -1009,7 +1037,7 @@ PlacesController.prototype = {
         var data = new TransferData();
         function addData(type, overrideURI) {
           data.addDataForFlavour(type, PlacesUIUtils._wrapString(
-                                 PlacesUtils.wrapNode(node, type, overrideURI)));
+                                 PlacesUtils.wrapNode(node, type, overrideURI, copy)));
         }
 
         function addURIData(overrideURI) {
@@ -1077,7 +1105,8 @@ PlacesController.prototype = {
                                                  uri) + suffix);
 
           var placeSuffix = i < (nodes.length - 1) ? "," : "";
-          return PlacesUtils.wrapNode(node, type, overrideURI) + placeSuffix;
+          var resolveShortcuts = !PlacesControllerDragHelper.canMoveContainerNode(node);
+          return PlacesUtils.wrapNode(node, type, overrideURI, resolveShortcuts) + placeSuffix;
         }
 
         // all items wrapped as TYPE_X_MOZ_PLACE
@@ -1241,7 +1270,7 @@ var PlacesControllerDragHelper = {
   /**
    * @returns The current active drag session. Returns null if there is none.
    */
-  getSession: function VO__getSession() {
+  getSession: function PCDH__getSession() {
     var dragService = Cc["@mozilla.org/widget/dragservice;1"].
                       getService(Ci.nsIDragService);
     return dragService.getCurrentSession();
@@ -1301,6 +1330,71 @@ var PlacesControllerDragHelper = {
     return true;
   },
 
+  /**
+   * Determines if a container node can be moved.
+   * 
+   * @param   aNode
+   *          A bookmark folder node.
+   * @param   [optional] aInsertionPoint
+   *          The insertion point of the drop target.
+   * @returns True if the container can be moved.
+   */
+  canMoveContainerNode:
+  function PCDH_canMoveContainerNode(aNode, aInsertionPoint) {
+    // can't move query root
+    if (!aNode.parent)
+      return false;
+
+    var targetId = aInsertionPoint ? aInsertionPoint.itemId : -1;
+    var parentId = PlacesUtils.getConcreteItemId(aNode.parent);
+    var concreteId = PlacesUtils.getConcreteItemId(aNode);
+
+    // can't move tag containers 
+    if (PlacesUtils.nodeIsTagQuery(aNode))
+      return false;
+
+    // check is child of a read-only container 
+    if (PlacesUtils.nodeIsReadOnly(aNode.parent))
+      return false;
+
+    // check for special folders, etc
+    if (!this.canMoveContainer(aNode.itemId, parentId))
+      return false;
+
+    return true;
+  },
+
+  /**
+   * Determines if a container node can be moved.
+   * 
+   * @param   aId
+   *          A bookmark folder id.
+   * @param   [optional] aParentId
+   *          The parent id of the folder.
+   * @returns True if the container can be moved to the target.
+   */
+  canMoveContainer:
+  function PCDH_canMoveContainer(aId, aParentId) {
+    if (aId == -1)
+      return false;
+
+    // Disallow moving of roots and special folders
+    const ROOTS = [PlacesUtils.placesRootId, PlacesUtils.bookmarksMenuFolderId,
+                   PlacesUtils.tagsFolderId, PlacesUtils.unfiledBookmarksFolderId,
+                   PlacesUtils.toolbarFolderId];
+    if (ROOTS.indexOf(aId) != -1)
+      return false;
+
+    // Get parent id if necessary
+    if (aParentId == null || aParentId == -1)
+      aParentId = PlacesUtils.bookmarks.getFolderIdForItem(aId);
+
+    if(PlacesUtils.bookmarks.getFolderReadonly(aParentId))
+      return false;
+
+    return true;
+  },
+
   /** 
    * Creates a Transferable object that can be filled with data of types
    * supported by a view. 
@@ -1327,6 +1421,8 @@ var PlacesControllerDragHelper = {
    */
   onDrop: function PCDH_onDrop(insertionPoint) {
     var session = this.getSession();
+    // XXX dragAction is not valid, so we also set copy below by checking
+    // whether the dropped item is moveable, before creating the transaction
     var copy = session.dragAction & Ci.nsIDragService.DRAGDROP_ACTION_COPY;
     var transactions = [];
     var xferable = this._initTransferable(session);
@@ -1344,13 +1440,13 @@ var PlacesControllerDragHelper = {
       // There's only ever one in the D&D case. 
       var unwrapped = PlacesUtils.unwrapNodes(data.value.data, 
                                               flavor.value)[0];
+
       var index = insertionPoint.index;
 
       // Adjust insertion index to prevent reversal of dragged items. When you
       // drag multiple elts upward: need to increment index or each successive
       // elt will be inserted at the same index, each above the previous.
-      if ((index != -1) && ((index < unwrapped.index) ||
-                           (unwrapped.folder && (index < unwrapped.folder.index)))) {
+      if (index != -1 && index < unwrapped.index) {
         index = index + movedCount;
         movedCount++;
       }
@@ -1362,6 +1458,12 @@ var PlacesControllerDragHelper = {
         transactions.push(PlacesUIUtils.ptm.tagURI(uri,[tagItemId]));
       }
       else {
+        if (unwrapped.id && !this.canMoveContainer(unwrapped.id, null))
+          copy = true;
+        else if (unwrapped.concreteId &&
+                 !this.canMoveContainer(unwrapped.concreteId, null))
+          copy = true;
+
         transactions.push(PlacesUIUtils.makeTransaction(unwrapped,
                           flavor.value, insertionPoint.itemId,
                           index, copy));

browser/components/places/content/editBookmarkOverlay.js

@@ -67,21 +67,25 @@ var gEditItemOverlay = {
   },
 
   _showHideRows: function EIO__showHideRows() {
-    var isBookmark = this._itemType == Ci.nsINavBookmarksService.TYPE_BOOKMARK;
+    var isBookmark = this._itemId != -1 &&
+                     this._itemType == Ci.nsINavBookmarksService.TYPE_BOOKMARK;
+    var isQuery = false;
+    if (this._uri)
+      isQuery = this._uri.schemeIs("place");
 
     this._element("nameRow").collapsed = this._hiddenRows.indexOf("name") != -1;
     this._element("folderRow").collapsed =
-      this._hiddenRows.indexOf("folderPicker") != -1;
-    this._element("tagsRow").collapsed = !isBookmark ||
-      this._hiddenRows.indexOf("tags") != -1;
+      this._hiddenRows.indexOf("folderPicker") != -1 || this._readOnly;
+
+    this._element("tagsRow").collapsed = !this._uri ||
+      this._hiddenRows.indexOf("tags") != -1 || isQuery;
     this._element("descriptionRow").collapsed =
-      this._hiddenRows.indexOf("description") != -1 ||
-      this._readOnly;
+      this._hiddenRows.indexOf("description") != -1 || this._readOnly;
     this._element("keywordRow").collapsed = !isBookmark || this._readOnly ||
-      this._hiddenRows.indexOf("keyword") != -1;
-    this._element("locationRow").collapsed = !isBookmark ||
+      this._hiddenRows.indexOf("keyword") != -1 || isQuery;
+    this._element("locationRow").collapsed = !isBookmark || isQuery ||
       this._hiddenRows.indexOf("location") != -1;
-    this._element("loadInSidebarCheckbox").collapsed = !isBookmark ||
+    this._element("loadInSidebarCheckbox").collapsed = !isBookmark || isQuery ||
       this._readOnly || this._hiddenRows.indexOf("loadInSidebar") != -1;
     this._element("feedLocationRow").collapsed = !this._isLivemark ||
       this._hiddenRows.indexOf("feedLocation") != -1;
@@ -91,8 +95,10 @@ var gEditItemOverlay = {
 
   /**
    * Initialize the panel
-   * @param aItemId
-   *        a places-itemId of a bookmark, folder or a live bookmark.
+   * @param aFor
+   *        Either a places-itemId (of a bookmark, folder or a live bookmark),
+   *        or a URI object (in which case, the panel would be initialized in
+   *        read-only mode).
    * @param [optional] aInfo
    *        JS object which stores additional info for the panel
    *        initialization. The following properties may bet set:
@@ -103,21 +109,57 @@ var gEditItemOverlay = {
    *        * forceReadOnly - set this flag to initialize the panel to its
    *          read-only (view) mode even if the given item is editable.
    */
-  initPanel: function EIO_initPanel(aItemId, aInfo) {
-    const bms = PlacesUtils.bookmarks;
-
+  initPanel: function EIO_initPanel(aFor, aInfo) {
     this._folderMenuList = this._element("folderMenuList");
     this._folderTree = this._element("folderTree");
-    this._itemId = aItemId;
-    this._itemType = bms.getItemType(this._itemId);
-    this._determineInfo(aInfo);
 
-    var container = bms.getFolderIdForItem(this._itemId);
-    if (this._itemType == Ci.nsINavBookmarksService.TYPE_BOOKMARK) {
-      this._uri = bms.getBookmarkURI(this._itemId);
+    this._determineInfo(aInfo);
+    if (aFor instanceof Ci.nsIURI) {
+      this._itemId = -1;
+      this._uri = aFor;
+      this._readOnly = true;
+    }
+    else {
+      this._itemId = aFor;
+      var container =  PlacesUtils.bookmarks.getFolderIdForItem(this._itemId);
+      this._itemType = PlacesUtils.bookmarks.getItemType(this._itemId);
+      if (this._itemType == Ci.nsINavBookmarksService.TYPE_BOOKMARK) {
+        this._uri = PlacesUtils.bookmarks.getBookmarkURI(this._itemId);
+        if (!this._readOnly) // If readOnly wasn't forced through aInfo
+          this._readOnly = PlacesUtils.livemarks.isLivemark(container);
+        this._initTextField("keywordField",
+                            PlacesUtils.bookmarks
+                                       .getKeywordForBookmark(this._itemId));
+        // Load In Sidebar checkbox
+        this._element("loadInSidebarCheckbox").checked =
+          PlacesUtils.annotations.itemHasAnnotation(this._itemId,
+                                                    LOAD_IN_SIDEBAR_ANNO);
+      }
+      else {
+        if (!this._readOnly) // If readOnly wasn't forced through aInfo
+          this._readOnly = false;
+
+        this._uri = null;
+        this._isLivemark = PlacesUtils.livemarks.isLivemark(this._itemId);
+        if (this._isLivemark) {
+          var feedURI = PlacesUtils.livemarks.getFeedURI(this._itemId);
+          var siteURI = PlacesUtils.livemarks.getSiteURI(this._itemId);
+          this._initTextField("feedLocationField", feedURI.spec);
+          this._initTextField("siteLocationField", siteURI ? siteURI.spec : "");
+        }
+      }
+
+      // folder picker
+      this._initFolderMenuList(container);
+
+      // description field
+      this._initTextField("descriptionField", 
+                          PlacesUIUtils.getItemDescription(this._itemId));
+    }
+
+    if (this._itemId == -1 ||
+        this._itemType == Ci.nsINavBookmarksService.TYPE_BOOKMARK) {
       this._isLivemark = false;
-      if (!this._readOnly) // If readOnly wasn't forced through aInfo
-        this._readOnly = PlacesUtils.livemarks.isLivemark(container);
 
       this._initTextField("locationField", this._uri.spec);
       this._initTextField("tagsField",
@@ -127,43 +169,17 @@ var gEditItemOverlay = {
 
       // tags selector
       this._rebuildTagsSelectorList();
-
-      this._initTextField("keywordField",
-                          bms.getKeywordForBookmark(this._itemId));
-
-      // Load In Sidebar checkbox
-      this._element("loadInSidebarCheckbox").checked =
-        PlacesUtils.annotations.itemHasAnnotation(this._itemId,
-                                                  LOAD_IN_SIDEBAR_ANNO);
     }
-    else {
-      if (!this._readOnly) // If readOnly wasn't forced through aInfo
-        this._readOnly = false;
-      this._isLivemark = PlacesUtils.livemarks.isLivemark(this._itemId);
-      if (this._isLivemark) {
-        var feedURI = PlacesUtils.livemarks.getFeedURI(this._itemId);
-        var siteURI = PlacesUtils.livemarks.getSiteURI(this._itemId);
-        this._initTextField("feedLocationField", feedURI.spec);
-        this._initTextField("siteLocationField", siteURI ? siteURI.spec : "");
-      }
-      this._uri = null;
-    }
-
-    // folder picker
-    this._initFolderMenuList(container);
 
     // name picker
     this._initNamePicker();
-
-    // description field
-    this._initTextField("descriptionField", 
-                        PlacesUIUtils.getItemDescription(this._itemId));
     
     this._showHideRows();
 
     // observe changes
     if (!this._observersAdded) {
-      PlacesUtils.bookmarks.addObserver(this, false);
+      if (this._itemId != -1)
+        PlacesUtils.bookmarks.addObserver(this, false);
       window.addEventListener("unload", this, false);
       this._observersAdded = true;
     }
@@ -309,13 +325,14 @@ var gEditItemOverlay = {
   },
 
   _getItemStaticTitle: function EIO__getItemStaticTitle() {
+    if (this._itemId == -1)
+      return PlacesUtils.history.getPageTitle(this._uri);
+
     const annos = PlacesUtils.annotations;
     if (annos.itemHasAnnotation(this._itemId, STATIC_TITLE_ANNO))
       return annos.getItemAnnotation(this._itemId, STATIC_TITLE_ANNO);
-    var title = PlacesUtils.bookmarks.getItemTitle(this._itemId);
-    if (title === null)
-      return PlacesUtils.history.getPageTitle(this._uri);
-    return title;
+
+    return PlacesUtils.bookmarks.getItemTitle(this._itemId);
   },
 
   _initNamePicker: function EIO_initNamePicker() {
@@ -337,7 +354,8 @@ var gEditItemOverlay = {
 
     var itemToSelect = userEnteredNameField;
     try {
-      if (this._itemType == Ci.nsINavBookmarksService.TYPE_BOOKMARK &&
+      if (this._itemId != -1 &&
+          this._itemType == Ci.nsINavBookmarksService.TYPE_BOOKMARK &&
           !this._readOnly)
         this._microsummaries = PlacesUIUtils.microsummaries
                                             .getMicrosummaries(this._uri, -1);
@@ -433,7 +451,9 @@ var gEditItemOverlay = {
     }
 
     if (this._observersAdded) {
-      PlacesUtils.bookmarks.removeObserver(this);
+      if (this._itemId != -1)
+        PlacesUtils.bookmarks.removeObserver(this);
+
       this._observersAdded = false;
     }
     if (this._microsummaries) {
@@ -441,6 +461,7 @@ var gEditItemOverlay = {
       this._microsummaries = null;
     }
     this._itemId = -1;
+    this._uri = null;
   },
 
   onTagsFieldBlur: function EIO_onTagsFieldBlur() {

browser/components/places/content/history-panel.js

@@ -68,20 +68,6 @@ function HistorySidebarInit()
 }
 
 function initContextMenu() {
-  // Force-hide items in the context menu which never apply to this view
-  var alwaysHideElements = ["placesContext_new:bookmark",
-                            "placesContext_new:folder",
-                            "placesContext_new:separator",
-                            "placesContext_cut",
-                            "placesContext_paste",
-                            "placesContext_sortBy:name"];
-  for (var i=0; i < alwaysHideElements.length; i++) {
-    var elt = document.getElementById(alwaysHideElements[i]);
-    elt.removeAttribute("selection");
-    elt.removeAttribute("forcehideselection");
-    elt.hidden = true;
-  }
-
   // Insert "Bookmark This Link" right before the copy item
   document.getElementById("placesContext")
           .insertBefore(document.getElementById("addBookmarkContextItem"),

browser/components/places/content/menu.xml

@@ -147,7 +147,7 @@
             newMarginTop = scrollBoxObject.height;
 
           // set the new marginTop based on arrowscrollbox
-          newMarginTop += scrollBoxObject.y - this.boxObject.y;
+          newMarginTop += scrollBoxObject.y - this._scrollBox.boxObject.y;
           this._indicatorBar.firstChild.style.marginTop = newMarginTop + "px";
           this._indicatorBar.hidden = false;
         ]]></body>
@@ -181,6 +181,8 @@
             this._overFolder.closeMenuTimer = this._overFolder
                                                   .setTimer(this._overFolder.hoverTime);
           }
+
+          this._rootView._draggedNode = null;
         ]]></body>
       </method>
 
@@ -189,9 +191,10 @@
         <parameter name="aXferData"/>
         <parameter name="aDragAction"/>
         <body><![CDATA[
-          // Force a copy action if parent node is a query
+          // Force a copy action if parent node is a query or not-removable
           if (aEvent.ctrlKey ||
-              PlacesUtils.nodeIsQuery(aEvent.target.node.parent))
+              PlacesUtils.nodeIsQuery(aEvent.target.node.parent) ||
+              !PlacesControllerDragHelper.canMoveContainerNode(aEvent.target.node))
             aDragAction.action = Ci.nsIDragService.DRAGDROP_ACTION_COPY;
 
           // activate the view and cache the dragged node
@@ -895,8 +898,9 @@
       <property name="insertionPoint">
         <getter><![CDATA[
           // By default, the insertion point is at the top level, at the end.
-          var index = -1;
+          var index = PlacesUtils.bookmarks.DEFAULT_INDEX;
           var folderId = 0;
+          var orientation = Ci.nsITreeView.DROP_BEFORE;
           var isTag = false;
 
           if (PlacesUtils.nodeIsFolder(this._resultNode)) {
@@ -906,20 +910,21 @@
 
           var selectedNode = this.selectedNode;
           if (selectedNode) {
-            if (PlacesUtils.nodeIsFolder(selectedNode)) {
-              // If there is a folder selected, the insertion point is the
-              // end of the folder.
+            var popupNode = document.popupNode;
+            if (popupNode == popupNode.parentNode._emptyMenuItem) {
+              // If (empty) menuitem is selected the insertion point
+              // is inside the folder, at the end.
               folderId = PlacesUtils.getConcreteItemId(selectedNode);
+              orientation = Ci.nsITreeView.DROP_ON;
             }
             else {
-              // If there is another type of node selected, the insertion point
-              // is after that node.
+              // In all other cases the insertion point is before that node.
               folderId = PlacesUtils.getConcreteItemId(selectedNode.parent);
               index = PlacesUtils.getIndexOfNode(selectedNode);
               isTag = PlacesUtils.nodeIsTagQuery(selectedNode.parent);
             }
           }
-          return new InsertionPoint(folderId, index, 1, isTag);
+          return new InsertionPoint(folderId, index, orientation, isTag);
         ]]></getter>
       </property>
 

browser/components/places/content/places.js

@@ -104,6 +104,10 @@ var PlacesOrganizer = {
     var historyMenuForward = document.getElementById("historyMenuForward");
     historyMenuForward.removeAttribute("key");
 #endif
+
+    // remove the "Properties" context-menu item, we've our own details pane
+    document.getElementById("placesContext")
+            .removeChild(document.getElementById("placesContext_show:info"));
   },
 
   QueryInterface: function PO_QueryInterface(aIID) {
@@ -208,13 +212,15 @@ var PlacesOrganizer = {
     options.excludeItems = false;
     var placeURI = PlacesUtils.history.queriesToQueryString(queries, queries.length, options);
 
-    // update the right-pane contents
-    if (this._content.place != placeURI)
+    // Update the right-pane contents.
+    // We must update also if the user clears the search box, in that case
+    // we are called with resetSearchBox == false.
+    if (this._content.place != placeURI || !resetSearchBox) {
       this._content.place = placeURI;
 
-    // This just updates the back/forward buttons, it doesn't call us back
-    // because node.uri is our current selection.
-    this.location = node.uri;
+      // Update the back/forward buttons.
+      this.location = node.uri;
+    }
 
     // Make sure the search UI is hidden.
     PlacesSearchBox.hideSearchUI();
@@ -224,6 +230,7 @@ var PlacesOrganizer = {
     }
 
     this._setSearchScopeForNode(node);
+    this._fillDetailsPane(node);
   },
 
   /**
@@ -305,6 +312,18 @@ var PlacesOrganizer = {
     }
   },
 
+  /**
+   * Handle focus changes on the trees.
+   * When moving focus between panes we should update the details pane contents.
+   * @param   aEvent
+   *          The mouse event.
+   */
+  onTreeFocus: function PO_onTreeFocus(aEvent) {
+    var currentView = aEvent.currentTarget;
+    var selectedNode = currentView.selectedNode;
+    this._fillDetailsPane(selectedNode);
+  },
+
   openFlatContainer: function PO_openFlatContainerFlatContainer(aContainer) {
     if (aContainer.itemId != -1)
       this._places.selectItems([aContainer.itemId]);
@@ -572,9 +591,10 @@ var PlacesOrganizer = {
      */
     var infoBox = document.getElementById("infoBox");
     var infoBoxExpander = document.getElementById("infoBoxExpander");
-    if ((PlacesUtils.nodeIsFolder(aNode) &&
-         !PlacesUtils.nodeIsLivemarkContainer(aNode)) ||
-        PlacesUtils.nodeIsLivemarkItem(aNode)) {
+    if (aNode.itemId != -1 &&
+        ((PlacesUtils.nodeIsFolder(aNode) &&
+          !PlacesUtils.nodeIsLivemarkContainer(aNode)) ||
+         PlacesUtils.nodeIsLivemarkItem(aNode))) {
       if (infoBox.getAttribute("minimal") == "true")
         infoBox.setAttribute("wasminimal", "true");
       infoBox.removeAttribute("minimal");
@@ -599,6 +619,13 @@ var PlacesOrganizer = {
   },
 
   onContentTreeSelect: function PO_onContentTreeSelect() {
+    this._fillDetailsPane(this._content.selectedNode);
+  },
+
+  _fillDetailsPane: function PO__fillDetailsPane(aSelectedNode) {
+    var infoBox = document.getElementById("infoBox");
+    var detailsDeck = document.getElementById("detailsDeck");
+
     // If a textbox within a panel is focused, force-blur it so its contents
     // are saved
     if (gEditItemOverlay.itemId != -1) {
@@ -607,39 +634,33 @@ var PlacesOrganizer = {
            focusedElement instanceof HTMLTextAreaElement) &&
           /^editBMPanel.*/.test(focusedElement.parentNode.parentNode.id))
         focusedElement.blur();
-    }
 
-    var infoBox = document.getElementById("infoBox");
-    var detailsDeck = document.getElementById("detailsDeck");
-    detailsDeck.selectedIndex = 1;
-    var selectedNode = this._content.selectedNode;
-    if (selectedNode) {
-      infoBox.hidden = false;
-      if (selectedNode.itemId != -1 &&
-          !PlacesUtils.nodeIsSeparator(selectedNode)) {
-        if (this._paneDisabled) {
-          this._setDetailsFieldsDisabledState(false);
-          this._paneDisabled = false;
-        }
-
-        // Using the concrete itemId is arguably wrong. The bookmarks API
-        // does allow setting properties for folder shortcuts as well, but since
-        // the UI does not distinct between the couple, we better just show
-        // the concrete item properties.
-        if (selectedNode.type ==
-            Ci.nsINavHistoryResultNode.RESULT_TYPE_FOLDER_SHORTCUT) {
-          gEditItemOverlay.initPanel(asQuery(selectedNode).folderItemId,
-                                     { hiddenRows: ["folderPicker"],
-                                       forceReadOnly: true });
-        }
-        else {
-          gEditItemOverlay.initPanel(selectedNode.itemId,
-                                     { hiddenRows: ["folderPicker"] });
-        }
-
-        this._detectAndSetDetailsPaneMinimalState(selectedNode);
+      // don't update the panel if we are already editing this node
+      if (aSelectedNode && gEditItemOverlay.itemId == aSelectedNode.itemId &&
+          detailsDeck.selectedIndex == 1)
         return;
+    }
+ 
+    if (aSelectedNode && !PlacesUtils.nodeIsSeparator(aSelectedNode)) {
+      detailsDeck.selectedIndex = 1;
+      infoBox.hidden = false;
+      // Using the concrete itemId is arguably wrong. The bookmarks API
+      // does allow setting properties for folder shortcuts as well, but since
+      // the UI does not distinct between the couple, we better just show
+      // the concrete item properties.
+      if (aSelectedNode.type ==
+          Ci.nsINavHistoryResultNode.RESULT_TYPE_FOLDER_SHORTCUT) {
+        gEditItemOverlay.initPanel(asQuery(aSelectedNode).folderItemId,
+                                  { hiddenRows: ["folderPicker"],
+                                    forceReadOnly: true });
       }
+      else {
+        var itemId = PlacesUtils.getConcreteItemId(aSelectedNode);
+        gEditItemOverlay.initPanel(itemId != -1 ? itemId :
+                                   PlacesUtils._uri(aSelectedNode.uri),
+                                   { hiddenRows: ["folderPicker"] });
+      }
+      this._detectAndSetDetailsPaneMinimalState(aSelectedNode);
     }
     else {
       detailsDeck.selectedIndex = 0;
@@ -664,13 +685,6 @@ var PlacesOrganizer = {
         }
       }
     }
-
-    // Nothing to do if the pane was already disabled
-    if (!this._paneDisabled) {
-      gEditItemOverlay.uninitPanel();
-      this._setDetailsFieldsDisabledState(true);
-      this._paneDisabled = true;
-    }
   },
 
   // NOT YET USED
@@ -716,13 +730,12 @@ var PlacesOrganizer = {
   saveSearch: function PO_saveSearch() {
     // Get the place: uri for the query.
     // If the advanced query builder is showing, use that.
-    var queries = PlacesQueryBuilder.queries;
     var options = this.getCurrentOptions();
 
-#ifndef PLACES_QUERY_BUILDER
-    var query = PlacesUtils.history.getNewQuery();
-    query.searchTerms = PlacesSearchBox.value;
-    queries.push(query);
+#ifdef PLACES_QUERY_BUILDER
+    var queries = PlacesQueryBuilder.queries;
+#else
+    var queries = this.getCurrentQueries();
 #endif
 
     var placeSpec = PlacesUtils.history.queriesToQueryString(queries,
@@ -1424,14 +1437,6 @@ var PlacesQueryBuilder = {
     // update collection type and get folders
     var folders = [];
     switch (id) {
-      case "scopeBarToolbar":
-        PlacesSearchBox.filterCollection = "collection";
-        folders.push(PlacesUtils.toolbarFolderId);
-        break;
-      case "scopeBarMenu":
-        PlacesSearchBox.filterCollection = "collection";
-        folders.push(PlacesUtils.bookmarksMenuFolderId);
-        break;
       case "scopeBarHistory":
         PlacesSearchBox.filterCollection = "history";
         folders = [];

browser/components/places/content/places.xul

@@ -181,10 +181,13 @@
 
   <popupset id="placesPopupset">
     <popup id="placesContext"/>
+    <popup id="placesColumnsContext"
+           onpopupshowing="ViewMenu.fillWithColumns(event, null, null, 'checkbox', null);"
+           oncommand="ViewMenu.showHideColumn(event.target); event.stopPropagation();"/>
   </popupset>
 
   <toolbox id="placesToolbox">
-    <toolbar class="chromeclass-toolbar" id="placesToolbar" align="center">
+    <toolbar class="chromeclass-toolbar" id="placesToolbar" align="center" chromedir="&locale.dir;">
       <toolbarbutton id="back-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
                      command="OrganizerCommand:Back"
                      tooltiptext="&backButton.tooltip;"
@@ -398,6 +401,7 @@
           hidecolumnpicker="true" context="placesContext"
           onselect="PlacesOrganizer.onPlaceSelected(true);"
           onclick="PlacesOrganizer.onTreeClick(event);"
+          onfocus="PlacesOrganizer.onTreeFocus(event);"          
           seltype="single"
           persist="width"
           width="200"
@@ -448,7 +452,8 @@
 #endif
           </vbox>
           <vbox flex="1">
-            <tree id="placeContent" class="placesTree" context="placesContext" 
+            <tree id="placeContent" class="placesTree" context="placesContext"
+                  hidecolumnpicker="true"
                   flex="1" type="places"
                   flatList="true"
                   enableColumnDrag="true"
@@ -456,8 +461,9 @@
                   ondblclick="PlacesOrganizer.openSelectedNode(event);"
                   onopenflatcontainer="PlacesOrganizer.openFlatContainer(aContainer);"
                   onselect="PlacesOrganizer.onContentTreeSelect();"
+                  onfocus="PlacesOrganizer.onTreeFocus(event);"
                   onclick="PlacesOrganizer.onTreeClick(event);">
-              <treecols id="placeContentColumns">
+              <treecols id="placeContentColumns" context="placesColumnsContext">
                 <treecol label="&col.name.label;" id="placesContentTitle" anonid="title" flex="5" primary="true" ordinal="1" 
                          persist="width hidden ordinal sortActive sortDirection"/>
                 <splitter class="tree-splitter"/>

browser/components/places/content/placesOverlay.xul

@@ -137,45 +137,49 @@
               command="placesCmd_new:bookmark"
               label="&cmd.new_bookmark.label;"
               accesskey="&cmd.new_bookmark.accesskey;"
-              selection="mutable"/>
+              selection="any"
+              hideifnoinsetionpoint="true"/>
     <menuitem id="placesContext_new:folder"
               command="placesCmd_new:folder"
               label="&cmd.new_folder.label;"
               accesskey="&cmd.context_new_folder.accesskey;"
-              selection="mutable"/>
+              selection="any"
+              hideifnoinsetionpoint="true"/>
     <menuitem id="placesContext_new:separator"
               command="placesCmd_new:separator"
               label="&cmd.new_separator.label;"
               accesskey="&cmd.new_separator.accesskey;"
               closemenu="single"
-              selection="mutable"/>
+              selection="any"
+              hideifnoinsetionpoint="true"/>
     <menuseparator id="placesContext_newSeparator"/>
     <menuitem id="placesContext_cut"
               command="cmd_cut"
               label="&cutCmd.label;"
               accesskey="&cutCmd.accesskey;" 
               closemenu="single"
-              selection="separator|link|folder|mixed|query"
-              forcehideselection="livemarkChild"/>
+              selection="bookmark|folder|separator|query"
+              forcehideselection="tagChild|livemarkChild"/>
     <menuitem id="placesContext_copy"
               command="cmd_copy"
               label="&copyCmd.label;"
               closemenu="single"
               accesskey="&copyCmd.accesskey;" 
-              selection="separator|link|folder|query"/>
+              selection="any"/>
     <menuitem id="placesContext_paste"
               command="cmd_paste"
               label="&pasteCmd.label;"
               closemenu="single"
               accesskey="&pasteCmd.accesskey;"
-              selection="mutable|query"/>
+              selection="any"
+              hideifnoinsetionpoint="true"/>
     <menuseparator id="placesContext_editSeparator"/>
     <menuitem id="placesContext_delete"
               command="cmd_delete"
               label="&deleteCmd.label;"
               accesskey="&deleteCmd.accesskey;"
               closemenu="single"
-              selection="host|separator|link|folder|day|query"
+              selection="any"
               forcehideselection="livemarkChild"/>
     <menuseparator id="placesContext_deleteSeparator"/>
     <menuitem id="placesContext_reload"
@@ -195,13 +199,13 @@
               label="&cmd.sortby_name.label;"
               accesskey="&cmd.context_sortby_name.accesskey;"
               closemenu="single"
-              selection="mutable"/>
+              selection="folder"/>
     <menuseparator id="placesContext_sortSeparator"/>
     <menuitem id="placesContext_show:info"
               command="placesCmd_show:info"
               label="&cmd.properties.label;" 
               accesskey="&cmd.properties.accesskey;"
-              selection="bookmark|folder"
+              selection="bookmark|folder|query"
               forcehideselection="livemarkChild"/>
   </popup>
 

browser/components/places/content/toolbar.xml

@@ -384,26 +384,28 @@
       <property name="insertionPoint">
         <getter><![CDATA[
           // By default, the insertion point is at the top level, at the end. 
-          var index = -1;
+          var index = PlacesUtils.bookmarks.DEFAULT_INDEX;
           var folderId = PlacesUtils.getConcreteItemId(this._result.root);
+          var orientation = Ci.nsITreeView.DROP_BEFORE;
           var isTag = false;
 
           var selectedNode = this.selectedNode;
           if (selectedNode) {
-            if (PlacesUtils.nodeIsFolder(selectedNode)) {
-              // If there is a folder selected, the insertion point is the
-              // end of the folder.
+            var popupNode = document.popupNode;
+            if (popupNode == popupNode.parentNode._emptyMenuItem) {
+              // If (empty) menuitem is selected the insertion point
+              // is inside the folder, at the end.
               folderId = PlacesUtils.getConcreteItemId(selectedNode);
+              orientation = Ci.nsITreeView.DROP_ON;
             }
             else {
-              // If there is another type of node selected, the insertion point
-              // is after that node.
+              // In all other cases the insertion point is before that node.
               folderId = PlacesUtils.getConcreteItemId(selectedNode.parent);
               index = PlacesUtils.getIndexOfNode(selectedNode);
               isTag = PlacesUtils.nodeIsTagQuery(selectedNode.parent);
             }
           }
-          return new InsertionPoint(folderId, index, 1, isTag);
+          return new InsertionPoint(folderId, index, orientation, isTag);
         ]]></getter>
       </property>
 
@@ -449,7 +451,7 @@
           if (this._self._result != val) {
             this._self._containerNodesMap = [];
             this._self._result = val;
-            if (val) // this calls _rebuild through invalidateContainer
+            if (val) // this calls _rebuild through invalidateContainer
               val.root.containerOpen = true;
           }
           return val;
@@ -916,6 +918,8 @@
           if (this._overFolder.node)
             this._overFolder.closeTimer = this._setTimer(this._overFolder.hoverTime);
           PlacesControllerDragHelper.currentDropTarget = null;
+
+          this._self._draggedNode = null;
         },
 
         getSupportedFlavours: function TBV_DO_getSupportedFlavours() {

browser/components/places/content/tree.xml

@@ -440,7 +440,7 @@
               return this._cachedInsertionPoint = null;
           }
 
-          var orientation = Ci.nsITreeView.DROP_AFTER;
+          var orientation = Ci.nsITreeView.DROP_BEFORE;
           // If there is no selection, insert at the end of the container. 
           if (!this.hasSelection) {
             var index = this.view.rowCount - 1;
@@ -451,9 +451,9 @@
 
           // This is a two-part process. The first part is determining the drop
           // orientation.
-          // * The default orientation is to drop _after_ the selected item. 
-          // * If the selected item is an open container, the default 
-          //   orientation is to drop _into_ that container.
+          // * The default orientation is to drop _before_ the selected item.
+          // * If the selected item is a container, the default orientation
+          //   is to drop _into_ that container.
           //
           // Warning: It may be tempting to use tree indexes in this code, but
           //          you must not, since the tree is nested and as your tree 
@@ -468,18 +468,18 @@
           var min = { }, max = { };
           selection.getRangeAt(rc - 1, min, max);
           
-          // If the sole selection is an open container, insert into it rather 
-          // than adjacent to it. Note that this only applies to _single_ 
-          // selections - if the last element within a multi-selection is an
-          // open folder, insert _adajacent_ to the selection.
+          // If the sole selection is a container, and we are not in
+          // a flatlist, insert into it.
+          // Note that this only applies to _single_ selections,
+          // if the last element within a multi-selection is a
+          // container, insert _adjacent_ to the selection.
           //
           // If the sole selection is the bookmarks toolbar folder, we insert
           // into it even if it is not opened
           var itemId =
             PlacesUtils.getConcreteItemId(resultView.nodeForTreeIndex(max.value));
           if (selection.count == 1 && resultView.isContainer(max.value) &&
-              (resultView.isContainerOpen(max.value) ||
-               itemId == PlacesUtils.bookmarksMenuFolderId))
+              !this.flatList)
             orientation = Ci.nsITreeView.DROP_ON;
 
           this._cachedInsertionPoint =
@@ -507,6 +507,7 @@
           var result = this.getResult();
           var resultview = this.getResultView();
           var container = result.root;
+          var dropNearItemId = -1;
           NS_ASSERT(container, "null container");
           // When there's no selection, assume the container is the container
           // the view is populated from (i.e. the result's itemId).
@@ -520,7 +521,8 @@
             }
             else if (!this._disallowInsertion(lastSelected) &&
                      lastSelected.containerOpen &&
-                     orientation == Ci.nsITreeView.DROP_AFTER) {
+                     orientation == Ci.nsITreeView.DROP_AFTER &&
+                     lastSelected.hasChildren) {
              // If the last selected item is an open container and the user is
              // trying to drag into it as a first item, really insert into it.
              container = lastSelected;
@@ -539,12 +541,19 @@
                 return null;
 
               var queryOptions = asQuery(result.root).queryOptions;
-              if (queryOptions.excludeItems || queryOptions.excludeQueries ||
-                  queryOptions.excludeReadOnlyFolders ||
-                  queryOptions.sortingMode != Ci.nsINavHistoryQueryOptions.SORT_BY_NONE) {
-                // If we are within either a sorted view or a view in which
-                // some items may be invisible, insert at the end
-                index = -1;   
+              if (queryOptions.sortingMode !=
+                    Ci.nsINavHistoryQueryOptions.SORT_BY_NONE) {
+                // If we are within a sorted view, insert at the end
+                index = -1;
+              }
+              else if (queryOptions.excludeItems ||
+                       queryOptions.excludeQueries ||
+                       queryOptions.excludeReadOnlyFolders) {
+                // Some item may be invisible, insert near last selected one.
+                // We don't replace index here to avoid requests to the db,
+                // instead it will be calculated later by the controller.
+                index = -1;
+                dropNearItemId = lastSelected.itemId;
               }
               else {
                 var lsi = PlacesUtils.getIndexOfNode(lastSelected);
@@ -558,7 +567,8 @@
 
           return new InsertionPoint(PlacesUtils.getConcreteItemId(container),
                                     index, orientation,
-                                    PlacesUtils.nodeIsTagQuery(container));
+                                    PlacesUtils.nodeIsTagQuery(container),
+                                    dropNearItemId);
         ]]></body>
       </method>
 
@@ -673,8 +683,9 @@
             // If this node is part of a readonly container (e.g. a livemark) it 
             // cannot be moved, only copied, so we must change the action used
             // by the drag session.
-            if (PlacesUtils.nodeIsReadOnly(parent) ||
-                PlacesUtils.nodeIsTagQuery(parent)) {
+            if (PlacesUtils.nodeIsTagQuery(parent) ||
+                !PlacesControllerDragHelper.canMoveContainerNode(node)) {
+              // XXX DOES NOTHING! dragAction doesn't persist
               dragAction.action = Ci.nsIDragService.DRAGDROP_ACTION_COPY;
               break;
             }
@@ -693,7 +704,10 @@
         <parameter name="event"/>
         <parameter name="session"/>
         <body><![CDATA[ 
-          return this.view.canDrop(-1, -1);
+          var row = { }, col = { }, child = { };
+          this.treeBoxObject.getCellAt(event.clientX, event.clientY, row, col, 
+                                       child);
+          return this.view.canDrop(row.value, -1);
         ]]></body>
       </method>
       
@@ -703,18 +717,11 @@
         <parameter name="flavor"/>
         <parameter name="session"/>
         <body><![CDATA[ 
-          // When the user is dragging over an empty area of the tree, make 
-          // sure canDrop is set to true to indicate dropping into the bucket.
-          var row = { }, col = { }, child = { };
-          this.treeBoxObject.getCellAt(event.clientX, event.clientY, row, col, 
-                                       child);
-          if (row.value == -1) {
-            var dragService = 
-                Cc["@mozilla.org/widget/dragservice;1"].
-                getService(Ci.nsIDragService);
-            var dragSession = dragService.getCurrentSession();
-            dragSession.canDrop = this.canDrop(-1, 1);
-          }
+          var dragService = 
+              Cc["@mozilla.org/widget/dragservice;1"].
+              getService(Ci.nsIDragService);
+          var dragSession = dragService.getCurrentSession();
+          dragSession.canDrop = this.canDrop(event, session);
         ]]></body>
       </method>
 

browser/components/places/content/treeView.js

@@ -140,6 +140,10 @@ PlacesTreeView.prototype = {
    * when a tree is detached to clear the list.
    */
   _buildVisibleList: function PTV__buildVisibleList() {
+    var selection = this.selection;
+    if (selection)
+      selection.selectEventsSuppressed = true;
+
     if (this._result) {
       // Any current visible elements need to be marked as invisible.
       for (var i = 0; i < this._visibleElements.length; i++) {
@@ -163,11 +167,12 @@ PlacesTreeView.prototype = {
         // this triggers containerOpened which then builds the visible
         // section
         rootNode.containerOpen = true;
-        return;
       }
-
-      this.invalidateContainer(rootNode);
+      else
+        this.invalidateContainer(rootNode);
     }
+    if (selection)
+      selection.selectEventsSuppressed = false;
   },
 
   /**
@@ -994,9 +999,6 @@ PlacesTreeView.prototype = {
       if (elt.localName == "tree" && elt.view == this &&
           this.selection.isSelected(aRow))
         return false;
-      if (node.parent && PlacesUtils.nodeIsReadOnly(node.parent) &&
-          !PlacesUtils.nodeIsTagQuery(node))
-        return false;
     }
   
     var ip = this._getInsertionPoint(aRow, aOrientation);
@@ -1017,6 +1019,7 @@ PlacesTreeView.prototype = {
 
   _getInsertionPoint: function PTV__getInsertionPoint(index, orientation) {
     var container = this._result.root;
+    var dropNearItemId = -1;
     // When there's no selection, assume the container is the container
     // the view is populated from (i.e. the result's itemId).
     if (index != -1) {
@@ -1029,7 +1032,8 @@ PlacesTreeView.prototype = {
       }
       else if (!this._disallowInsertion(lastSelected) &&
                lastSelected.containerOpen &&
-               orientation == Ci.nsITreeView.DROP_AFTER) {
+               orientation == Ci.nsITreeView.DROP_AFTER &&
+               lastSelected.hasChildren) {
         // If the last selected item is an open container and the user is
         // trying to drag into it as a first item, really insert into it.
         container = lastSelected;
@@ -1047,8 +1051,24 @@ PlacesTreeView.prototype = {
         if (this._disallowInsertion(container))
           return null;
 
-        var lsi = PlacesUtils.getIndexOfNode(lastSelected);
-        index = orientation == Ci.nsITreeView.DROP_BEFORE ? lsi : lsi + 1;
+        var queryOptions = asQuery(this._result.root).queryOptions;
+        if (queryOptions.sortingMode != Ci.nsINavHistoryQueryOptions.SORT_BY_NONE) {
+          // If we are within a sorted view, insert at the end
+          index = -1;
+        }
+        else if (queryOptions.excludeItems ||
+                 queryOptions.excludeQueries ||
+                 queryOptions.excludeReadOnlyFolders) {
+          // Some item may be invisible, insert near last selected one.
+          // We don't replace index here to avoid requests to the db,
+          // instead it will be calculated later by the controller.
+          index = -1;
+          dropNearItemId = lastSelected.itemId;
+        }
+        else {
+          var lsi = PlacesUtils.getIndexOfNode(lastSelected);
+          index = orientation == Ci.nsITreeView.DROP_BEFORE ? lsi : lsi + 1;
+        }
       }
     }
 
@@ -1057,7 +1077,8 @@ PlacesTreeView.prototype = {
 
     return new InsertionPoint(PlacesUtils.getConcreteItemId(container),
                               index, orientation,
-                              PlacesUtils.nodeIsTagQuery(container));
+                              PlacesUtils.nodeIsTagQuery(container),
+                              dropNearItemId);
   },
 
   drop: function PTV_drop(aRow, aOrientation) {

browser/components/places/content/utils.js

@@ -60,6 +60,7 @@ const LMANNO_FEEDURI = "livemark/feedURI";
 const LMANNO_SITEURI = "livemark/siteURI";
 const ORGANIZER_FOLDER_ANNO = "PlacesOrganizer/OrganizerFolder";
 const ORGANIZER_QUERY_ANNO = "PlacesOrganizer/OrganizerQuery";
+const ORGANIZER_LEFTPANE_VERSION = 4;
 
 #ifdef XP_MACOSX
 // On Mac OSX, the transferable system converts "\r\n" to "\n\n", where we
@@ -254,10 +255,11 @@ var PlacesUIUtils = {
         var txn = null;
         var node = aChildren[i];
 
-        // adjusted to make sure that items are given the correct index -
-        // transactions insert differently if index == -1
-        if (aIndex > -1)
-          index = aIndex + i;
+        // Make sure that items are given the correct index, this will be
+        // passed by the transaction manager to the backend for the insertion.
+        // Insertion behaves differently if index == DEFAULT_INDEX (append)
+        if (aIndex != PlacesUtils.bookmarks.DEFAULT_INDEX)
+          index = i;
 
         if (node.type == PlacesUtils.TYPE_X_MOZ_PLACE_CONTAINER) {
           if (node.livemark && node.annos) // node is a livemark
@@ -423,7 +425,7 @@ var PlacesUIUtils = {
    * @return true if any transaction has been performed.
    *
    * Notes:
-   *  - the location, description and "load in sidebar" fields are
+   *  - the location, description and "loadInSidebar" fields are
    *    visible only if there is no initial URI (aURI is null).
    *  - When aDefaultInsertionPoint is not set, the dialog defaults to the
    *    bookmarks root folder.
@@ -491,7 +493,7 @@ var PlacesUIUtils = {
     var info = {
       action: "add",
       type: "bookmark",
-      hiddenRows: ["location", "description", "load in sidebar"]
+      hiddenRows: ["location", "description", "loadInSidebar"]
     };
     if (aURI)
       info.uri = aURI;
@@ -638,33 +640,19 @@ var PlacesUIUtils = {
   },
 
   /**
-   * Opens the bookmark properties panel for a given bookmark identifier.
+   * Opens the properties dialog for a given item identifier.
    *
-   * @param aId
-   *        bookmark identifier for which the properties are to be shown
+   * @param aItemId
+   *        item identifier for which the properties are to be shown
+   * @param aType
+   *        item type, either "bookmark" or "folder"
    * @return true if any transaction has been performed.
    */
-  showBookmarkProperties: function PU_showBookmarkProperties(aId) {
+  showItemProperties: function PU_showItemProperties(aItemId, aType) {
     var info = {
       action: "edit",
-      type: "bookmark",
-      bookmarkId: aId
-    };
-    return this._showBookmarkDialog(info);
-  },
-
-  /**
-   * Opens the folder properties panel for a given folder ID.
-   *
-   * @param aId
-   *        an integer representing the ID of the folder to edit
-   * @return true if any transaction has been performed.
-   */
-  showFolderProperties: function PU_showFolderProperties(aId) {
-    var info = {
-      action: "edit",
-      type: "folder",
-      folderId: aId
+      type: aType,
+      itemId: aItemId
     };
     return this._showBookmarkDialog(info);
   },
@@ -1129,14 +1117,26 @@ var PlacesUIUtils = {
   get leftPaneFolderId() {
     var leftPaneRoot = -1;
     var allBookmarksId;
-    var items = PlacesUtils.annotations.getItemsWithAnnotation(ORGANIZER_FOLDER_ANNO, {});
-    if (items.length != 0 && items[0] != -1)
+    var items = PlacesUtils.annotations
+                           .getItemsWithAnnotation(ORGANIZER_FOLDER_ANNO, {});
+    if (items.length != 0 && items[0] != -1) {
       leftPaneRoot = items[0];
+      // check organizer left pane version
+      var version = PlacesUtils.annotations
+                               .getItemAnnotation(leftPaneRoot, ORGANIZER_FOLDER_ANNO);
+      if (version != ORGANIZER_LEFTPANE_VERSION) {
+        // If version is not valid we must rebuild the left pane.
+        PlacesUtils.bookmarks.removeFolder(leftPaneRoot);
+        leftPaneRoot = -1;
+      }
+    }
+
     if (leftPaneRoot != -1) {
       // Build the leftPaneQueries Map
       delete this.leftPaneQueries;
       this.leftPaneQueries = {};
-      var items = PlacesUtils.annotations.getItemsWithAnnotation(ORGANIZER_QUERY_ANNO, { });
+      var items = PlacesUtils.annotations
+                             .getItemsWithAnnotation(ORGANIZER_QUERY_ANNO, {});
       for (var i=0; i < items.length; i++) {
         var queryName = PlacesUtils.annotations
                                    .getItemAnnotation(items[i], ORGANIZER_QUERY_ANNO);
@@ -1155,6 +1155,8 @@ var PlacesUIUtils = {
 
         // Left Pane Root Folder
         leftPaneRoot = PlacesUtils.bookmarks.createFolder(PlacesUtils.placesRootId, "", -1);
+        // ensure immediate children can't be removed
+        PlacesUtils.bookmarks.setFolderReadonly(leftPaneRoot, true);
 
         // History Query
         let uri = PlacesUtils._uri("place:sort=4&");
@@ -1185,6 +1187,9 @@ var PlacesUIUtils = {
                                                   "AllBookmarks", 0, EXPIRE_NEVER);
         self.leftPaneQueries["AllBookmarks"] = itemId;
 
+        // disallow manipulating this folder within the organizer UI
+        PlacesUtils.bookmarks.setFolderReadonly(allBookmarksId, true);
+
         // All Bookmarks->Bookmarks Toolbar Query
         uri = PlacesUtils._uri("place:folder=TOOLBAR");
         itemId = PlacesUtils.bookmarks.insertBookmark(allBookmarksId, uri, -1, null);
@@ -1212,8 +1217,10 @@ var PlacesUIUtils = {
       }
     };
     PlacesUtils.bookmarks.runInBatchMode(callback, null);
-    PlacesUtils.annotations.setItemAnnotation(leftPaneRoot, ORGANIZER_FOLDER_ANNO,
-                                              true, 0, EXPIRE_NEVER);
+    PlacesUtils.annotations.setItemAnnotation(leftPaneRoot,
+                                              ORGANIZER_FOLDER_ANNO,
+                                              ORGANIZER_LEFTPANE_VERSION,
+                                              0, EXPIRE_NEVER);
     delete this.leftPaneFolderId;
     return this.leftPaneFolderId = leftPaneRoot;
   },

browser/components/places/tests/browser/Makefile.in

@@ -45,6 +45,7 @@ include $(topsrcdir)/config/rules.mk
 
 _BROWSER_TEST_FILES = \
 	browser_425884.js \
+	browser_423515.js \
 	$(NULL)
 
 libs:: $(_BROWSER_TEST_FILES)

browser/components/places/tests/browser/browser_423515.js

@@ -0,0 +1,243 @@
+/* vim:set ts=2 sw=2 sts=2 et: */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Places test code.
+ *
+ * The Initial Developer of the Original Code is Mozilla Corp.
+ * Portions created by the Initial Developer are Copyright (C) 2008
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *  Dietrich Ayala <dietrich@mozilla.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+function test() {
+  // sanity check
+  ok(PlacesUtils, "checking PlacesUtils, running in chrome context?");
+  ok(PlacesUIUtils, "checking PlacesUIUtils, running in chrome context?");
+  ok(PlacesControllerDragHelper, "checking PlacesControllerDragHelper, running in chrome context?");
+
+  const IDX = PlacesUtils.bookmarks.DEFAULT_INDEX;
+
+  // setup
+  var rootId = PlacesUtils.bookmarks.createFolder(PlacesUtils.toolbarFolderId, "", IDX);
+  var rootNode = PlacesUtils.getFolderContents(rootId, false, true).root;
+  is(rootNode.childCount, 0, "confirm test root is empty");
+
+  var tests = [];
+
+  // add a regular folder, should be moveable
+  tests.push({
+    populate: function() {
+      this.id =
+        PlacesUtils.bookmarks.createFolder(rootId, "", IDX);
+    },
+    validate: function() {
+      is(rootNode.childCount, 1,
+        "populate added data to the test root");
+      is(PlacesControllerDragHelper.canMoveContainer(this.id),
+         true, "can move regular folder id");
+      is(PlacesControllerDragHelper.canMoveContainerNode(rootNode.getChild(0)),
+         true, "can move regular folder node");
+    }
+  });
+
+  // add a regular folder shortcut, should be moveable
+  tests.push({
+    populate: function() {
+      this.folderId =
+        PlacesUtils.bookmarks.createFolder(rootId, "foo", IDX);
+      this.shortcutId =
+        PlacesUtils.bookmarks.insertBookmark(rootId, makeURI("place:folder="+this.folderId), IDX, "bar");
+    },
+    validate: function() {
+      is(rootNode.childCount, 2,
+        "populated data to the test root");
+
+      var folderNode = rootNode.getChild(0);
+      is(folderNode.type, 6, "node is folder");
+      is(this.folderId, folderNode.itemId, "folder id and folder node item id match");
+
+      var shortcutNode = rootNode.getChild(1);
+      is(shortcutNode.type, 9, "node is folder shortcut");
+      is(this.shortcutId, shortcutNode.itemId, "shortcut id and shortcut node item id match");
+
+      var concreteId = PlacesUtils.getConcreteItemId(shortcutNode);
+      is(concreteId, folderNode.itemId, "shortcut node id and concrete id match");
+
+      is(PlacesControllerDragHelper.canMoveContainer(this.shortcutId),
+         true, "can move folder shortcut id");
+
+      is(PlacesControllerDragHelper.canMoveContainerNode(shortcutNode),
+         true, "can move folder shortcut node");
+    }
+  });
+
+  // add a regular query, should be moveable
+  tests.push({
+    populate: function() {
+      this.bookmarkId =
+        PlacesUtils.bookmarks.insertBookmark(rootId, makeURI("http://foo.com"), IDX, "foo");
+      this.queryId =
+        PlacesUtils.bookmarks.insertBookmark(rootId, makeURI("place:terms=foo"), IDX, "bar");
+    },
+    validate: function() {
+      is(rootNode.childCount, 2,
+        "populated data to the test root");
+
+      var bmNode = rootNode.getChild(0);
+      is(bmNode.itemId, this.bookmarkId, "bookmark id and bookmark node item id match");
+
+      var queryNode = rootNode.getChild(1);
+      is(queryNode.itemId, this.queryId, "query id and query node item id match");
+
+      is(PlacesControllerDragHelper.canMoveContainer(this.queryId),
+         true, "can move query id");
+
+      is(PlacesControllerDragHelper.canMoveContainerNode(queryNode),
+         true, "can move query node");
+    }
+  });
+
+  // test that special folders cannot be moved
+  // test that special folders shortcuts can be moved
+  tests.push({
+    folders: [PlacesUtils.bookmarksMenuFolderId,
+              PlacesUtils.tagsFolderId, PlacesUtils.unfiledBookmarksFolderId,
+              PlacesUtils.toolbarFolderId],
+    shortcuts: {},
+    populate: function() {
+      for (var i = 0; i < this.folders.length; i++) {
+        var id = this.folders[i];
+        this.shortcuts[id] =
+          PlacesUtils.bookmarks.insertBookmark(rootId, makeURI("place:folder=" + id), IDX, "");
+      }
+    },
+    validate: function() {
+      // test toolbar shortcut node
+      is(rootNode.childCount, this.folders.length,
+        "populated data to the test root");
+
+      function getRootChildNode(aId) {
+        var node = PlacesUtils.getFolderContents(PlacesUtils.placesRootId, false, true).root;
+        for (var i = 0; i < node.childCount; i++) {
+          var child = node.getChild(i);
+          if (child.itemId == aId)
+            return child;
+        }
+      }
+
+      for (var i = 0; i < this.folders.length; i++) {
+        var id = this.folders[i];
+
+        is(PlacesControllerDragHelper.canMoveContainer(id),
+           false, "shouldn't be able to move special folder id");
+
+        //var node = PlacesUtils.getFolderContents(id, false, true).root;
+        var node = getRootChildNode(id);
+        is(PlacesControllerDragHelper.canMoveContainerNode(node),
+           false, "shouldn't be able to move special folder node");
+
+        var shortcutId = this.shortcuts[id];
+        var shortcutNode = rootNode.getChild(i);
+
+        is(shortcutNode.itemId, shortcutId, "shortcut id and shortcut node item id match");
+
+        LOG("can move shortcut id?");
+        is(PlacesControllerDragHelper.canMoveContainer(shortcutId),
+           true, "should be able to move special folder shortcut id");
+
+        LOG("can move shortcut node?");
+        is(PlacesControllerDragHelper.canMoveContainerNode(shortcutNode),
+           true, "should be able to move special folder shortcut node");
+      }
+    }
+  });
+
+  // test that a tag container cannot be moved
+  tests.push({
+    populate: function() {
+      // tag a uri
+      this.uri = makeURI("http://foo.com");
+      PlacesUtils.tagging.tagURI(this.uri, ["bar"]);
+    },
+    validate: function() {
+      // get tag root
+      var query = PlacesUtils.history.getNewQuery();
+      var options = PlacesUtils.history.getNewQueryOptions();
+      options.resultType = Ci.nsINavHistoryQueryOptions.RESULTS_AS_TAG_QUERY;
+      var tagsNode = PlacesUtils.history.executeQuery(query, options).root;
+
+      tagsNode.containerOpen = true;
+      is(tagsNode.childCount, 1, "has new tag");
+
+      var tagNode = tagsNode.getChild(0);
+      
+      is(PlacesControllerDragHelper.canMoveContainerNode(tagNode),
+         false, "should not be able to move tag container node");
+    }
+  });
+
+  // test that any child of a read-only node cannot be moved
+  tests.push({
+    populate: function() {
+      this.id =
+        PlacesUtils.bookmarks.createFolder(rootId, "foo", IDX);
+      PlacesUtils.bookmarks.createFolder(this.id, "bar", IDX);
+      PlacesUtils.bookmarks.setFolderReadonly(this.id, true);
+    },
+    validate: function() {
+      is(rootNode.childCount, 1,
+        "populate added data to the test root");
+      var readOnlyFolder = rootNode.getChild(0);
+
+      // test that we can move the read-only folder
+      is(PlacesControllerDragHelper.canMoveContainer(this.id),
+         true, "can move read-only folder id");
+      is(PlacesControllerDragHelper.canMoveContainerNode(readOnlyFolder),
+         true, "can move read-only folder node");
+
+      // test that we cannot move the child of a read-only folder
+      readOnlyFolder.QueryInterface(Ci.nsINavHistoryContainerResultNode);
+      readOnlyFolder.containerOpen = true;
+      var childFolder = readOnlyFolder.getChild(0);
+
+      is(PlacesControllerDragHelper.canMoveContainer(childFolder.itemId),
+         false, "cannot move a child of a read-only folder");
+      is(PlacesControllerDragHelper.canMoveContainerNode(childFolder),
+         false, "cannot move a child node of a read-only folder node");
+    }
+  });
+
+  tests.forEach(function(aTest) {
+    PlacesUtils.bookmarks.removeFolderChildren(rootId);
+    aTest.populate();
+    aTest.validate();
+  });
+
+  PlacesUtils.bookmarks.removeItem(rootId);
+}

browser/components/preferences/colors.xul

@@ -116,7 +116,7 @@
     <hbox>
       <checkbox id="useDocumentColors" 
                 label="&allowPagesToUse.label;" accesskey="&allowPagesToUse.accesskey;"
-                preference="browser.display.use_document_colors"/>
+                preference="browser.display.use_document_colors" flex="1"/>
     </hbox>
   </prefpane>
 </prefwindow>

browser/components/safebrowsing/content/globalstore.js

@@ -150,13 +150,17 @@ PROT_DataProvider.prototype.getUrlPref_ = function(prefName) {
   var appInfo = Components.classes["@mozilla.org/xre/app-info;1"]
                           .getService(Components.interfaces.nsIXULAppInfo);
 
-  var mozClientStr = MOZ_OFFICIAL_BUILD ? 'navclient-auto-ffox' : appInfo.name;
+  var mozClientStr = this.prefs_.getPref("browser.safebrowsing.clientid",
+                                         MOZ_OFFICIAL_BUILD ? 'navclient-auto-ffox' : appInfo.name);
+
+  var versionStr = this.prefs_.getPref("browser.safebrowsing.clientver",
+                                       appInfo.version);
 
   // Parameter substitution
   url = url.replace(MOZ_PARAM_LOCALE, this.getLocale_());
   url = url.replace(MOZ_PARAM_CLIENT, mozClientStr);
   url = url.replace(MOZ_PARAM_BUILDID, appInfo.appBuildID);
-  url = url.replace(MOZ_PARAM_VERSION, appInfo.version);
+  url = url.replace(MOZ_PARAM_VERSION, versionStr);
   return url;
 }
 

browser/components/search/content/search.xml

@@ -97,7 +97,7 @@
                           oncommand="openManager(event);"/>
           </xul:menupopup>
         </xul:button>
-        <xul:hbox class="search-go-container">
+        <xul:hbox class="search-go-container" chromedir="&locale.dir;">
           <xul:image class="search-go-button"
                      anonid="search-go-button"
                      chromedir="&locale.dir;"

browser/components/shell/src/nsWindowsShellService.cpp

@@ -66,7 +66,13 @@
 
 #include "windows.h"
 #include "shellapi.h"
-#include "shlobj.h"
+
+#ifdef _WIN32_WINNT
+#undef _WIN32_WINNT
+#endif
+#define _WIN32_WINNT 0x0600
+#define INITGUID
+#include <shlobj.h>
 
 #include <mbstring.h>
 
@@ -215,60 +221,16 @@ static SETTING gSettings[] = {
   { MAKE_KEY_NAME1("HTTPS", SOP),  "", VAL_OPEN, APP_PATH_SUBSTITUTION }
 };
 
-
-// Support for versions of shlobj.h that don't include the Vista API's
-#if !defined(IApplicationAssociationRegistration)
-
-typedef enum tagASSOCIATIONLEVEL {
-  AL_MACHINE,
-  AL_EFFECTIVE,
-  AL_USER
-} ASSOCIATIONLEVEL;
-
-typedef enum tagASSOCIATIONTYPE {
-  AT_FILEEXTENSION,
-  AT_URLPROTOCOL,
-  AT_STARTMENUCLIENT,
-  AT_MIMETYPE
-} ASSOCIATIONTYPE;
-
-MIDL_INTERFACE("4e530b0a-e611-4c77-a3ac-9031d022281b")
-IApplicationAssociationRegistration : public IUnknown
-{
- public:
-  virtual HRESULT STDMETHODCALLTYPE QueryCurrentDefault(LPCWSTR pszQuery,
-                                                        ASSOCIATIONTYPE atQueryType,
-                                                        ASSOCIATIONLEVEL alQueryLevel,
-                                                        LPWSTR *ppszAssociation) = 0;
-  virtual HRESULT STDMETHODCALLTYPE QueryAppIsDefault(LPCWSTR pszQuery,
-                                                      ASSOCIATIONTYPE atQueryType,
-                                                      ASSOCIATIONLEVEL alQueryLevel,
-                                                      LPCWSTR pszAppRegistryName,
-                                                      BOOL *pfDefault) = 0;
-  virtual HRESULT STDMETHODCALLTYPE QueryAppIsDefaultAll(ASSOCIATIONLEVEL alQueryLevel,
-                                                         LPCWSTR pszAppRegistryName,
-                                                         BOOL *pfDefault) = 0;
-  virtual HRESULT STDMETHODCALLTYPE SetAppAsDefault(LPCWSTR pszAppRegistryName,
-                                                    LPCWSTR pszSet,
-                                                    ASSOCIATIONTYPE atSetType) = 0;
-  virtual HRESULT STDMETHODCALLTYPE SetAppAsDefaultAll(LPCWSTR pszAppRegistryName) = 0;
-  virtual HRESULT STDMETHODCALLTYPE ClearUserAssociations(void) = 0;
-};
-#endif
-
-static const CLSID CLSID_ApplicationAssociationReg = {0x591209C7,0x767B,0x42B2,{0x9F,0xBA,0x44,0xEE,0x46,0x15,0xF2,0xC7}};
-static const IID   IID_IApplicationAssociationReg  = {0x4e530b0a,0xe611,0x4c77,{0xa3,0xac,0x90,0x31,0xd0,0x22,0x28,0x1b}};
-
-
 PRBool
 nsWindowsShellService::IsDefaultBrowserVista(PRBool aStartupCheck, PRBool* aIsDefaultBrowser)
 {
+#if !defined(MOZ_DISABLE_VISTA_SDK_REQUIREMENTS)
   IApplicationAssociationRegistration* pAAR;
   
-  HRESULT hr = CoCreateInstance(CLSID_ApplicationAssociationReg,
+  HRESULT hr = CoCreateInstance(CLSID_ApplicationAssociationRegistration,
                                 NULL,
                                 CLSCTX_INPROC,
-                                IID_IApplicationAssociationReg,
+                                IID_IApplicationAssociationRegistration,
                                 (void**)&pAAR);
   
   if (SUCCEEDED(hr)) {
@@ -285,7 +247,7 @@ nsWindowsShellService::IsDefaultBrowserVista(PRBool aStartupCheck, PRBool* aIsDe
     pAAR->Release();
     return PR_TRUE;
   }
-  
+#endif  
   return PR_FALSE;
 }
 

browser/components/shell/src/nsWindowsShellService.h

@@ -58,7 +58,6 @@ public:
 
 protected:
   PRBool    IsDefaultBrowserVista(PRBool aStartupCheck, PRBool* aIsDefaultBrowser);
-  PRBool    SetDefaultBrowserVista();
 
   PRBool    GetMailAccountKey(HKEY* aResult);
   void      SetRegKey(const nsString& aKeyName,

browser/installer/removed-files.in

@@ -103,6 +103,25 @@ uninstall/uninst.exe
 uninstall/uninstall.exe
 components/myspell/en-US.dic
 components/myspell/en-US.aff
+searchplugins/centrum-cz.xml
+searchplugins/eBay-fy-NL.xml
+searchplugins/eBay-nl.xml
+searchplugins/eBay-zh-CN.xml
+searchplugins/eBay-zh-TW.xml
+searchplugins/filesearchru.xml
+searchplugins/goo.xml
+searchplugins/google-ar.xml
+searchplugins/grandiccionari.xml
+searchplugins/lingvo.yandex.ru.xml
+searchplugins/nana.xml
+searchplugins/netex.xml
+searchplugins/nosaltres.xml
+searchplugins/pbi-pl.xml
+searchplugins/taobao.xml
+searchplugins/wikipedia-zh.xml
+searchplugins/yahoo-jp-shopping.xml
+searchplugins/yahoo-ru.xml
+searchplugins/yahoo-zh-CN.xml
 searchplugins/DRAE.src
 searchplugins/DRAE.png
 searchplugins/DRAE.gif

browser/locales/en-US/os2/README.txt

@@ -265,7 +265,7 @@ milestone release.
 - Firefox cannot make use of OS/2 fonts like WarpSans and others which
   are not available in Type1 or TrueType format. It is therefore
   recommended to install the "Workplace Sans" font from
-     http://www.cs-club.org/~alex/creative/fonts/
+     http://users.socis.ca/~ataylo00/creative/fonts/
   or
      http://hobbes.nmsu.edu/cgi-bin/h-search?key=wpsu_ttf
   which Firefox will use as a replacement of WarpSans.

browser/locales/shipped-locales

@@ -1,5 +1,5 @@
 af
-ar linux win32
+ar
 be
 ca
 cs
@@ -16,7 +16,7 @@ fr
 fy-NL
 ga-IE
 gu-IN linux win32
-he linux win32
+he
 hu
 id
 it

browser/themes/gnomestripe/browser/browser.css

@@ -881,8 +881,14 @@ toolbar[iconsize="small"] #paste-button[disabled="true"] {
   display: none;
 }
 
+#identity-box.verifiedDomain > hbox {
+  background-color: rgba(30, 80, 170, 0.7);
+  color: white;
+}
+
 #identity-box.verifiedIdentity > hbox {
-  background-color: rgba(0, 255, 0, 0.25);
+  background-color: rgba(50, 150, 50, 0.8);
+  color: white;
 }
 
 /* Identity popup icons */
@@ -955,15 +961,6 @@ toolbar[iconsize="small"] #paste-button[disabled="true"] {
   padding: 10px;
 }
 
-/* Secure site coloring */
-#urlbar[level="high"][pageproxystate="valid"] > .autocomplete-textbox-container,
-#urlbar[level="low"][pageproxystate="valid"] > .autocomplete-textbox-container,
-#urlbar[level="high"][pageproxystate="valid"] #autocomplete-security-wrapper,
-#urlbar[level="low"][pageproxystate="valid"] #autocomplete-security-wrapper {
-  background-color: #F5F6BE; /* #F7F898; */
-  color: #000000;
-}
-
 #urlbar > .autocomplete-textbox-container {
   -moz-binding: url(chrome://browser/skin/browser.xml#autocomplete-security-wrapper);
 }
@@ -1165,7 +1162,6 @@ statusbarpanel#statusbar-display {
 
 #navigator-throbber[busy="true"] {
   list-style-image: url("chrome://global/skin/icons/loading_16.png");
-  opacity: 0.5;
 }
 
 #navigator-throbber > hbox {
@@ -1181,7 +1177,6 @@ toolbar[iconsize="small"] #navigator-throbber {
 toolbar[mode="text"] #navigator-throbber[busy="true"],
 toolbar[iconsize="small"] #navigator-throbber[busy="true"] {
   list-style-image: url("chrome://global/skin/icons/loading_16.png");
-  opacity: 0.5;
 }
 
 tabpanels {
@@ -1197,7 +1192,6 @@ tabpanels {
 
 .tabbrowser-tab[selected="true"] {
   margin-bottom: 0px;
-  font-weight: bold;
 }
 
 .tab-icon-image {
@@ -1211,7 +1205,6 @@ tabpanels {
 
 .tabbrowser-tab[busy] > .tab-icon-image {
   list-style-image: url("chrome://global/skin/icons/loading_16.png") !important;
-  opacity: 0.6;
 }
 
 .tabs-bottom {
@@ -1318,6 +1311,11 @@ tabpanels {
   margin: 0px;
 }
 
+.tabs-alltabs-box-animate {
+  background-color: Highlight;
+  opacity: 0.0;
+}
+
 /* All tabs menupopup */
 .alltabs-item > .menu-iconic-left > .menu-iconic-icon {
   list-style-image: url("chrome://global/skin/icons/folder-item.png");
@@ -1330,7 +1328,6 @@ tabpanels {
 
 .alltabs-item[busy] > .menu-iconic-left > .menu-iconic-icon {
   list-style-image: url("chrome://global/skin/icons/loading_16.png");
-  opacity: 0.6;
 }
 
 .tabs-alltabs-button > .toolbarbutton-icon {
@@ -1345,7 +1342,6 @@ tabpanels {
 
 #sidebar-throbber[loading="true"] {
   list-style-image: url("chrome://global/skin/icons/loading_16.png");
-  opacity: 0.5;
   -moz-margin-end: 4px;
 }
 

browser/themes/gnomestripe/browser/places/organizer.css

@@ -80,7 +80,6 @@
 }
 
 #infoPaneBox {
-  border-top: 1px solid ThreeDShadow;
   padding: 5px;
 }
 

browser/themes/pinstripe/browser/bookmarks/addBookmark.css

@@ -1,108 +0,0 @@
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-@namespace html url("http://www.w3.org/1999/xhtml");
-
-.folder-icon > .menulist-label-box > .menulist-icon,
-.folder-icon > .menu-iconic-left > .menu-iconic-icon {
-  width: 16px;
-  height: 16px;
-}
-
-.folder-icon > .menu-iconic-left {
-  display: -moz-box;
-}
-
-.folder-icon {
-  list-style-image: url("chrome://global/skin/tree/folder.png") !important;
-}
-
-.menulist-icon {
-	margin: 0px !important;
-}
-
-#folder-tree {
-	margin: 6px 0px;
-	font: message-box;
-}
-
-dialog {
-	font: menu;
-}
-
-#expander {
-  -moz-appearance: none;
-  margin-left: 8px;
-  padding: 0px;
-  min-width: 0px;
-}
-
-#addgroup {
-	margin-top: 6px;
-        margin-bottom: 0px;
-}
-
-.up {
-	list-style-image: url("chrome://browser/skin/bookmarks/expander-open.png") !important;
-}
-
-.down {
-	list-style-image: url("chrome://browser/skin/bookmarks/expander-closed.png") !important;
-}
-
-.down:hover:active {
-	list-style-image: url("chrome://browser/skin/bookmarks/expander-closed-active.png") !important;
-}
-
-.up:hover:active {
-	list-style-image: url("chrome://browser/skin/bookmarks/expander-open-active.png") !important;
-}
-
-/* Make the microsummary picker look like a regular textbox instead of 
- * an editable menulist when no microsummaries are available.
- */
-
-menulist#name[droppable="false"] {
-  -moz-appearance: none;
-  margin: 0px;
-  border: none;
-  padding: 0px;
-  height: auto !important;
-}
-
-menulist#name[droppable="false"] > .menulist-editable-box {
-  /* These rules are duplicates of the rules for the textbox element
-   * in textbox.css and should track changes in that file.
-   */
-  -moz-appearance: textfield;
-  cursor: text;
-  margin: 4px 4px;
-  border: 3px solid;
-  -moz-border-top-colors: transparent #888888 #000000;
-  -moz-border-right-colors: transparent #FFFFFF #000000;
-  -moz-border-bottom-colors: transparent #FFFFFF #000000;
-  -moz-border-left-colors: transparent #888888 #000000;
-  -moz-border-radius-topright: 2px;
-  -moz-border-radius-bottomleft: 2px;
-  /*padding: 1px 0px 1px 2px ;*/
-  padding: 0px;
-  background-color: -moz-Field;
-  color: -moz-FieldText;
-}
-
-menulist#name[droppable="false"] > .menulist-editable-box > html|*.textbox-input {
-  margin: 0px !important;
-  border: none !important;
-  padding: 0px !important;
-  background-color: inherit;
-  color: inherit;
-  font: inherit;
-}
-
-/* Hide the drop marker and the popup. */
-
-menulist#name[droppable="false"] > .menulist-dropmarker {
-  display: none;
-}
-
-menulist#name[droppable="false"] > menupopup {
-  display: none;
-}

browser/themes/pinstripe/browser/bookmarks/bookmarksManager.css

@@ -1,107 +0,0 @@
-#bookmark-window toolbarbutton {
-  list-style-image: url("chrome://browser/skin/bookmarks/Bookmarks-toolbar.png");
-  -moz-box-orient: vertical;
-}
-
-toolbarbutton#newbookmark {
-  -moz-image-region: rect(0px, 168px, 24px, 144px);
-}
-toolbarbutton#newbookmark:not([disabled="true"]):hover {
-  -moz-image-region: rect(24px, 168px, 48px, 144px);
-}
-toolbarbutton#newbookmark[disabled="true"] {
-  -moz-image-region: rect(48px, 168px, 72px, 144px);
-}
-toolbarbutton#newbookmark:not([disabled="true"]):hover:active {
-  -moz-image-region: rect(72px, 168px, 96px, 144px);
-}
-
-toolbarbutton#newfolder {
-  -moz-image-region: rect(0px, 24px, 24px, 0px);
-}
-toolbarbutton#newfolder:not([disabled="true"]):hover {
-  -moz-image-region: rect(24px, 24px, 48px, 0px);
-}
-toolbarbutton#newfolder[disabled="true"] {
-  -moz-image-region: rect(48px, 24px, 72px, 0px);
-}
-toolbarbutton#newfolder:not([disabled="true"]):hover:active {
-  -moz-image-region: rect(72px, 24px, 96px, 0px);
-}
-
-toolbarbutton#newseparator {
-  -moz-image-region: rect(0px, 48px, 24px, 24px);
-}
-toolbarbutton#newseparator:not([disabled="true"]):hover {
-  -moz-image-region: rect(24px, 48px, 48px, 24px);
-}
-toolbarbutton#newseparator[disabled="true"] {
-  -moz-image-region: rect(48px, 48px, 72px, 24px);
-}
-toolbarbutton#newseparator:not([disabled="true"]):hover:active {
-  -moz-image-region: rect(72px, 48px, 96px, 24px);
-}
-
-toolbarbutton#moveBookmark {
-  -moz-image-region: rect(0px, 72px, 24px, 48px);
-}
-toolbarbutton#moveBookmark:not([disabled="true"]):hover {
-  -moz-image-region: rect(24px, 72px, 48px, 48px);
-}
-toolbarbutton#moveBookmark[disabled="true"] {
-  -moz-image-region: rect(48px, 72px, 72px, 48px);
-}
-toolbarbutton#moveBookmark:not([disabled="true"]):hover:active {
-  -moz-image-region: rect(72px, 72px, 96px, 48px);
-}
-
-toolbarbutton#properties {
-  -moz-image-region: rect(0px, 96px, 24px, 72px);
-}
-toolbarbutton#properties:not([disabled="true"]):hover {
-  -moz-image-region: rect(24px, 96px, 48px, 72px);
-}
-toolbarbutton#properties[disabled="true"] {
-  -moz-image-region: rect(48px, 96px, 72px, 72px);
-}
-toolbarbutton#properties:not([disabled="true"]):hover:active {
-  -moz-image-region: rect(72px, 96px, 96px, 72px);
-}
-
-toolbarbutton#rename {
-  -moz-image-region: rect(0px, 120px, 24px, 96px);
-}
-toolbarbutton#rename:not([disabled="true"]):hover {
-  -moz-image-region: rect(24px, 120px, 48px, 96px);
-}
-toolbarbutton#rename[disabled="true"] {
-  -moz-image-region: rect(48px, 120px, 72px, 96px);
-}
-toolbarbutton#rename:not([disabled="true"]):hover:active {
-  -moz-image-region: rect(72px, 120px, 96px, 96px);
-}
-
-toolbarbutton#delete {
-  -moz-image-region: rect(0px, 144px, 24px, 120px);
-}
-toolbarbutton#delete:not([disabled="true"]):hover {
-  -moz-image-region: rect(24px, 144px, 48px, 120px);
-}
-toolbarbutton#delete[disabled="true"] {
-  -moz-image-region: rect(48px, 144px, 72px, 120px);
-}
-toolbarbutton#delete:not([disabled="true"]):hover:active {
-  -moz-image-region: rect(72px, 144px, 96px, 120px);
-}
-
-#bookmarks-search {
-	background-image: none;
-}
-
-.bookmarksTree {
-  margin: 0px !important;
-}
-
-#bookmark-views-splitter {
-  border-right: 1px solid #bebebe;
-}

browser/themes/pinstripe/browser/bookmarks/bookmarksProperties.css

@@ -1,90 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Firefox.
- *
- * The Initial Developer of the Original Code is Mozilla.
- * Portions created by the Initial Developer are Copyright (C) 2006
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Myk Melez <myk@mozilla.org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-@namespace html url("http://www.w3.org/1999/xhtml");
-
-/* Make the microsummary picker look like a regular textbox instead of 
- * an editable menulist when no microsummaries are available.
- */
-
-menulist#name[droppable="false"] {
-  -moz-appearance: none;
-  margin: 0px;
-  border: none;
-  padding: 0px;
-  height: auto !important;
-}
-
-menulist#name[droppable="false"] > .menulist-dropmarker {
-  display: none;
-}
-
-menulist#name[droppable="false"] > .menulist-editable-box {
-  /* These rules are duplicates of the rules for the textbox element
-   * in textbox.css and should track changes in that file.
-   */
-  -moz-appearance: textfield;
-  cursor: text;
-  margin: 2px 4px;
-  border: 2px solid;
-  -moz-border-top-colors: ThreeDShadow ThreeDDarkShadow;
-  -moz-border-right-colors: ThreeDHighlight ThreeDLightShadow;
-  -moz-border-bottom-colors: ThreeDHighlight ThreeDLightShadow;
-  -moz-border-left-colors: ThreeDShadow ThreeDDarkShadow;
-  padding: 2px 2px 3px 4px;
-  background-color: -moz-Field;
-  color: -moz-FieldText;
-}
-
-menulist#name[droppable="false"] > .menulist-editable-box > html|*.textbox-input {
-  margin: 0px !important;
-  border: none !important;
-  padding: 0px !important;
-  background-color: inherit;
-  color: inherit;
-  font: inherit;
-}
-
-/* Hide the drop marker and the popup. */
-
-menulist#name[droppable="false"] > .menulist-dropmarker {
-  display: none;
-}
-
-menulist#name[droppable="false"] > menupopup {
-  display: none;
-}

browser/themes/pinstripe/browser/browser.css

@@ -74,6 +74,31 @@
 
 /* ----- BOOKMARK BUTTONS ----- */	
 
+toolbarbutton.bookmark-item {
+  font-weight: bold;
+  margin: 0 1px;
+  padding: 0;
+  -moz-padding-start: 7px;
+  min-width: 0;
+  max-width: 13em;
+  color: #222;
+  border: none !important;
+}
+
+toolbarbutton.bookmark-item[type=menu] > .toolbarbutton-menu-dropmarker {
+  -moz-padding-end: 7px;
+}
+
+toolbarbutton.bookmark-item[type=menu] > .toolbarbutton-menu-dropmarker[chromedir="rtl"] {
+  -moz-padding-start: 4px;
+  -moz-padding-end: 2px;
+}
+
+toolbarbutton.bookmark-item[chromedir="rtl"] {
+  -moz-padding-start: 0px;
+  -moz-padding-end: 7px;
+}
+
 .bookmark-item[container] {
   list-style-image: url("chrome://global/skin/tree/folder.png");
 }
@@ -82,15 +107,6 @@
   list-style-image: url("chrome://browser/skin/places/history.png");
 }
 
-toolbarbutton.bookmark-item:hover
-{
-  background: url("chrome://global/skin/toolbar/toolbarbutton-customhover-left.png") no-repeat left center;
-}
-
-toolbarbutton.bookmark-item:hover:active, toolbarbutton.bookmark-item[open="true"] {
-  background:url("chrome://browser/skin/bookmark-open-left.png") no-repeat left center;
-}
-
 toolbarbutton.bookmark-item > .toolbarbutton-text-stack > label {
   margin: 0;
 }
@@ -103,19 +119,37 @@ toolbarbutton.bookmark-item:not([container]) > .toolbarbutton-text-stack {
   -moz-padding-end: 7px;
 }
 
+toolbarbutton.bookmark-item[chromedir="rtl"] > .toolbarbutton-text-stack {
+  -moz-padding-end: 0;
+  -moz-padding-start: 7px;
+}
+
+toolbarbutton.bookmark-item:hover {
+  background: url("chrome://global/skin/toolbar/toolbarbutton-customhover-left.png") no-repeat left center;
+}
+
+toolbarbutton.bookmark-item:hover:active,
+toolbarbutton.bookmark-item[open="true"] {
+  background:url("chrome://browser/skin/bookmark-open-left.png") no-repeat left center;
+}
 
 toolbarbutton.bookmark-item:not([container]):hover > .toolbarbutton-text-stack,
-toolbarbutton.bookmark-item[container]:not([open]):hover > .toolbarbutton-menu-dropmarker 
-{
+toolbarbutton.bookmark-item[container]:not([open]):hover > .toolbarbutton-menu-dropmarker {
   background: url("chrome://global/skin/toolbar/toolbarbutton-customhover-right.png") no-repeat right center;
 }
 
 toolbarbutton.bookmark-item[container]:hover > .toolbarbutton-text-stack,
-#home-button.bookmark-item:hover > .toolbarbutton-icon
-{
+toolbarbutton.bookmark-item[container]:not([open]):hover > .toolbarbutton-menu-dropmarker[chromedir="rtl"],
+#home-button.bookmark-item:hover > .toolbarbutton-icon,
+#home-button.bookmark-item[chromedir="rtl"]:hover > .toolbarbutton-text-stack {
   background: url("chrome://global/skin/toolbar/toolbarbutton-customhover-mid.png") repeat-x;
 }
 
+#home-button.bookmark-item:hover[chromedir="rtl"] > .toolbarbutton-icon,
+toolbarbutton.bookmark-item[chromedir="rtl"]:hover > .toolbarbutton-text-stack {
+  background: url("chrome://global/skin/toolbar/toolbarbutton-customhover-right.png") no-repeat right center;
+}
+
 toolbarbutton.bookmark-item:not([container]):hover:active  > .toolbarbutton-text-stack,
 toolbarbutton.bookmark-item[open] > .toolbarbutton-menu-dropmarker,
 toolbarbutton.bookmark-item[container]:hover:active > .toolbarbutton-menu-dropmarker 
@@ -125,28 +159,17 @@ toolbarbutton.bookmark-item[container]:hover:active > .toolbarbutton-menu-dropma
 
 toolbarbutton.bookmark-item[container]:hover:active  > .toolbarbutton-text-stack,
 toolbarbutton.bookmark-item[container][open="true"] > .toolbarbutton-text-stack,
-#home-button.bookmark-item:hover:active > .toolbarbutton-icon 
-{
+#home-button.bookmark-item:hover:active > .toolbarbutton-icon,
+toolbarbutton.bookmark-item[container]:hover:active > .toolbarbutton-menu-dropmarker[chromedir="rtl"],
+toolbarbutton.bookmark-item[container][open="true"] > .toolbarbutton-menu-dropmarker[chromedir="rtl"],
+#home-button.bookmark-item:hover:active[chromedir="rtl"] > .toolbarbutton-text-stack {
   background: url("chrome://browser/skin/bookmark-open-mid.png") repeat-x !important;
 }
 
-toolbarbutton.bookmark-item[type=menu] {
-  padding-left: 7px;
-}
-
-toolbarbutton.bookmark-item[type=menu] > .toolbarbutton-menu-dropmarker {
-  padding-right: 7px;
-}
-
-toolbarbutton.bookmark-item {
-  font-weight: bold;
-  margin: 0 1px;
-  padding: 0;
-  -moz-padding-start: 7px;
-  min-width: 0;
-  max-width: 13em;
-  color: #222;
-  border: none !important;
+toolbarbutton.bookmark-item[chromedir="rtl"][container]:hover:active  > .toolbarbutton-text-stack,
+toolbarbutton.bookmark-item[chromedir="rtl"][container][open] > .toolbarbutton-text-stack,
+#home-button.bookmark-item[chromedir="rtl"]:hover:active > .toolbarbutton-icon {
+  background: url("chrome://browser/skin/bookmark-open-right.png") no-repeat right center !important;
 }
 
 toolbarbutton.bookmark-item:not([container="true"]) {
@@ -164,7 +187,6 @@ toolbarbutton.bookmark-item-microsummarized {
 .bookmark-item > .toolbarbutton-icon {
   margin: 0px;
   display: none !important;
- 
 }
 
 toolbarbutton.bookmark-item .toolbarbutton-text {
@@ -187,11 +209,7 @@ toolbarbutton.bookmark-item .toolbarbutton-text {
 
 .bookmark-item[livemark] > .toolbarbutton-menu-dropmarker {
   list-style-image: url("chrome://browser/skin/places/livemarkFolder.png");
-  padding: 4px 4px 3px 2px;
-}
-
-.bookmark-item[livemark]:hover > .toolbarbutton-menu-dropmarker, .bookmark-item[livemark][open] > .toolbarbutton-menu-dropmarker {
-  list-style-image: url("chrome://browser/skin/places/livemarkFolderHover.png");
+  padding: 3px 4px 3px 4px;
 }
 
 .bookmark-item[livemark] {
@@ -272,6 +290,11 @@ toolbarpaletteitem[place="toolbar"] .places-toolbar-items {
   -moz-box-orient: vertical;
 }
 
+.toolbarbutton-1[chromedir="rtl"],
+#back-forward-dropmarker[chromedir="rtl"] {
+  list-style-image: url("chrome://browser/skin/Toolbar-rtl.png");
+}
+
 toolbar[mode="text"] .toolbarbutton-1,
 toolbar[mode="text"] .toolbarbutton-menubutton-button {
   -moz-box-orient: horizontal;
@@ -332,11 +355,11 @@ toolbar[mode="icons"] #forward-button .toolbarbutton-text-box,
   -moz-image-region: rect(0px, 36px, 23px, 0px);
 }
 #back-button[disabled="true"] {
-  -moz-image-region: rect(23px, 36px, 46px, 0px) !important;
+  -moz-image-region: rect(23px, 36px, 46px, 0px);
 }
-#back-button:hover:active,
-#back-button[buttondown="true"],
-#back-button[open="true"]{
+#back-button:hover:active:not([disabled]),
+#back-button[buttondown="true"]:not([disabled]),
+#back-button[open="true"] {
   -moz-image-region: rect(46px, 36px, 69px, 0px);
 }
 
@@ -347,60 +370,90 @@ toolbar[mode="icons"] #forward-button .toolbarbutton-text-box,
 }
 
 #forward-button[disabled="true"] {
-  -moz-image-region: rect(23px, 72px, 46px, 36px) !important;
+  -moz-image-region: rect(23px, 72px, 46px, 36px);
 }
-#forward-button:hover:active,
-#forward-button[buttondown="true"],
+#forward-button:hover:active:not([disabled]),
+#forward-button[buttondown="true"]:not([disabled]),
 #forward-button[open="true"] {
   -moz-image-region: rect(46px, 72px, 69px, 36px);
 }
 
 /* ----- DEFAULT BACK/FORWARD BUTTONS ----- */
 
-toolbar[mode="icons"] #back-button {
-  -moz-image-region: rect(0px, 539px, 33px, 504px) !important;
-  -moz-margin-end: 0 !important;
-  -moz-padding-end: 0 !important;
-  border-left: none !important;
-  border-right: none !important;
+toolbar[mode="icons"] #unified-back-forward-button > #back-button {
+  -moz-image-region: rect(0px, 539px, 33px, 504px);
+  -moz-margin-end: 0;
+  -moz-padding-end: 0;
+  border-left: none;
+  border-right: none;
 }
 
-toolbar[mode="icons"] #back-button[disabled="true"] {
- -moz-image-region: rect(33px, 539px, 66px, 504px) !important;
+toolbar[mode="icons"] #unified-back-forward-button > #back-button[chromedir="rtl"] {
+  -moz-image-region: rect(0px, 582px, 33px, 547px);
 }
 
-toolbar[mode="icons"] #back-button:hover:active:not([disabled]),
-toolbar[mode="icons"] #back-button[open="true"] {
-  -moz-image-region: rect(66px, 539px, 99px, 504px) !important;
+toolbar[mode="icons"] #unified-back-forward-button > #back-button[disabled="true"] {
+ -moz-image-region: rect(33px, 539px, 66px, 504px);
 }
 
-toolbar[mode="icons"] #forward-button {
-  -moz-image-region: rect(0px, 566px, 33px, 539px) !important;
-  -moz-margin-start: 0 !important;
-  -moz-margin-end: 0 !important;
-  -moz-padding-start: 0 !important;
-  -moz-padding-end: 0 !important;
-  border-left: none !important;
-  border-right: none !important;
+toolbar[mode="icons"] #unified-back-forward-button > #back-button[disabled="true"][chromedir="rtl"] {
+  -moz-image-region: rect(33px, 582px, 66px, 547px);
 }
 
-toolbar[mode="icons"] #forward-button[disabled="true"] {
- -moz-image-region: rect(33px, 566px, 66px, 539px) !important;
+toolbar[mode="icons"] #unified-back-forward-button > #back-button:hover:active:not([disabled]),
+toolbar[mode="icons"] #unified-back-forward-button > #back-button[open="true"] {
+  -moz-image-region: rect(66px, 539px, 99px, 504px);
 }
 
-toolbar[mode="icons"] #forward-button:hover:active:not([disabled]),
-toolbar[mode="icons"] #forward-button[open="true"] {
-  -moz-image-region: rect(66px, 566px, 99px, 539px) !important;
+toolbar[mode="icons"] #unified-back-forward-button > #back-button:hover:active[chromedir="rtl"]:not([disabled]),
+toolbar[mode="icons"] #unified-back-forward-button > #back-button[open="true"][chromedir="rtl"] {
+  -moz-image-region: rect(66px, 582px, 99px, 547px);
 }
 
-toolbar[mode="icons"] #back-forward-dropmarker {
-  -moz-image-region: rect(0px, 582px, 33px, 566px) !important;
-  -moz-margin-start: 0 !important;
-  -moz-margin-end: 3px !important;
-  -moz-padding-start: 0 !important;
-  -moz-padding-end: 1px !important;
-  border-left: none !important;
-  border-right: none !important;
+toolbar[mode="icons"] #unified-back-forward-button > #forward-button {
+  -moz-image-region: rect(0px, 566px, 33px, 539px);
+  -moz-margin-start: 0;
+  -moz-margin-end: 0;
+  -moz-padding-start: 0;
+  -moz-padding-end: 0;
+  border-left: none;
+  border-right: none;
+}
+
+toolbar[mode="icons"] #unified-back-forward-button > #forward-button[chromedir="rtl"] {
+  -moz-image-region: rect(0px, 547px, 33px, 519px);
+}
+
+toolbar[mode="icons"] #unified-back-forward-button > #forward-button[disabled="true"] {
+ -moz-image-region: rect(33px, 566px, 66px, 539px);
+}
+
+toolbar[mode="icons"] #unified-back-forward-button > #forward-button[disabled="true"][chromedir="rtl"] {
+ -moz-image-region: rect(33px, 547px, 66px, 519px);
+}
+
+toolbar[mode="icons"] #unified-back-forward-button > #forward-button:hover:active:not([disabled]),
+toolbar[mode="icons"] #unified-back-forward-button > #forward-button[open="true"] {
+  -moz-image-region: rect(66px, 566px, 99px, 539px);
+}
+
+toolbar[mode="icons"] #unified-back-forward-button > #forward-button[chromedir="rtl"]:hover:active:not([disabled]),
+toolbar[mode="icons"] #unified-back-forward-button > #forward-button[open="true"][chromedir="rtl"] {
+  -moz-image-region: rect(66px, 547px, 99px, 519px);
+}
+
+#back-forward-dropmarker {
+  -moz-image-region: rect(0px, 582px, 33px, 566px);
+  -moz-margin-start: 0;
+  -moz-margin-end: 3px;
+  -moz-padding-start: 0;
+  -moz-padding-end: 1px;
+  border-left: none;
+  border-right: none;
+}
+
+#back-forward-dropmarker[chromedir="rtl"] {
+  -moz-image-region: rect(0px, 519px, 33px, 504px);
 }
 
 toolbar[mode="icons"] #back-forward-dropmarker > image {
@@ -413,64 +466,125 @@ toolbar[mode="icons"] #back-forward-dropmarker > dropmarker {
   display: none;
 }
 
-toolbar[mode="icons"] #back-forward-dropmarker[disabled="true"] {
- -moz-image-region: rect(33px, 582px, 66px, 566px) !important;
+#back-forward-dropmarker[disabled="true"] {
+ -moz-image-region: rect(33px, 582px, 66px, 566px);
 }
 
-toolbar[mode="icons"] #back-forward-dropmarker:hover:active:not([disabled]),
-toolbar[mode="icons"] #back-forward-dropmarker[open="true"] {
-  -moz-image-region: rect(0px, 582px, 33px, 566px) !important;
+#back-forward-dropmarker[disabled="true"][chromedir="rtl"] {
+ -moz-image-region: rect(33px, 519px, 66px, 504px);
 }
 
+#back-forward-dropmarker:hover:active:not([disabled]),
+#back-forward-dropmarker[open="true"] {
+  -moz-image-region: rect(66px, 582px, 99px, 566px);
+}
+
+#back-forward-dropmarker[chromedir="rtl"]:hover:active:not([disabled]),
+#back-forward-dropmarker[open="true"][chromedir="rtl"] {
+  -moz-image-region: rect(66px, 519px, 99px, 504px);
+}
+
+.unified-nav-back[_moz-menuactive],
+menupopup[chromedir="rtl"] > .unified-nav-forward[_moz-menuactive] {
+  list-style-image: url("chrome://browser/skin/menu-back.png") !important;
+}
+
+.unified-nav-forward[_moz-menuactive],
+menupopup[chromedir="rtl"] > .unified-nav-back[_moz-menuactive] {
+  list-style-image: url("chrome://browser/skin/menu-forward.png") !important;
+}
+
+
 /* ----- SMALL BACK BUTTON, PAIRED----- */	
 
-toolbar[iconsize="small"][mode="icons"] #back-button {
-  -moz-image-region: rect(0px, 616px, 23px, 582px) !important;
-  -moz-margin-end: 0 !important;
-  -moz-padding-end: 0 !important;
-  border-left: none !important;
-  border-right: none !important;
+toolbar[mode="icons"][iconsize="small"] #unified-back-forward-button > #back-button {
+  -moz-image-region: rect(0px, 616px, 23px, 582px);
+  -moz-margin-end: 0;
+  -moz-padding-end: 0;
+  border-left: none;
+  border-right: none;
 }
 
-toolbar[iconsize="small"][mode="icons"] #back-button[disabled="true"] {
-  -moz-image-region: rect(23px, 616px, 46px, 582px) !important;
+toolbar[mode="icons"][iconsize="small"] #unified-back-forward-button > #back-button[chromedir="rtl"] {
+  -moz-image-region: rect(0px, 664px, 23px, 630px);
 }
 
-toolbar[iconsize="small"][mode="icons"] #back-button:hover:active:not([disabled]),
-toolbar[iconsize="small"][mode="icons"] #back-button[open="true"] {
-  -moz-image-region: rect(46px, 616px, 69px, 582px) !important;
+toolbar[mode="icons"][iconsize="small"] #unified-back-forward-button > #back-button[disabled="true"] {
+  -moz-image-region: rect(23px, 616px, 46px, 582px);
+}
+
+toolbar[mode="icons"][iconsize="small"] #unified-back-forward-button > #back-button[disabled="true"][chromedir="rtl"] {
+  -moz-image-region: rect(23px, 664px, 46px, 630px);
+}
+
+toolbar[mode="icons"][iconsize="small"] #unified-back-forward-button > #back-button:hover:active:not([disabled]),
+toolbar[mode="icons"][iconsize="small"] #unified-back-forward-button > #back-button[open="true"] {
+  -moz-image-region: rect(46px, 616px, 69px, 582px);
+}
+
+toolbar[mode="icons"][iconsize="small"] #unified-back-forward-button > #back-button[chromedir="rtl"]:hover:active:not([disabled]),
+toolbar[mode="icons"][iconsize="small"] #unified-back-forward-button > #back-button[open="true"][chromedir="rtl"] {
+  -moz-image-region: rect(46px, 664px, 69px, 630px);
 }
 
 /* ----- SMALL FORWARD BUTTON, PAIRED ----- */	
 
-toolbar[iconsize="small"][mode="icons"] #forward-button {
-  -moz-image-region: rect(0px, 649px, 23px, 616px) !important;
-  -moz-margin-start: 0 !important;
-  -moz-padding-start: 0 !important;
-  border-left: none !important;
-  border-right: none !important;
+toolbar[mode="icons"][iconsize="small"] #unified-back-forward-button > #forward-button {
+  -moz-image-region: rect(0px, 649px, 23px, 616px);
+  -moz-margin-start: 0;
+  -moz-padding-start: 0;
+  border-left: none;
+  border-right: none;
 }
-toolbar[iconsize="small"][mode="icons"] #forward-button[disabled="true"] {
- -moz-image-region: rect(23px, 649px, 46px, 616px) !important;
+
+toolbar[mode="icons"][iconsize="small"] #unified-back-forward-button > #forward-button[chromedir="rtl"] {
+  -moz-image-region: rect(0px, 630px, 23px, 597px);
 }
-toolbar[iconsize="small"][mode="icons"] #forward-button:hover:active:not([disabled]),
-toolbar[iconsize="small"][mode="icons"] #forward-button[open="true"] {
-  -moz-image-region: rect(46px, 649px, 69px, 616px) !important;
+
+toolbar[mode="icons"][iconsize="small"] #unified-back-forward-button > #forward-button[disabled="true"] {
+ -moz-image-region: rect(23px, 649px, 46px, 616px);
+}
+
+toolbar[mode="icons"][iconsize="small"] #unified-back-forward-button > #forward-button[disabled="true"][chromedir="rtl"] {
+ -moz-image-region: rect(23px, 630px, 46px, 597px);
+}
+
+toolbar[mode="icons"][iconsize="small"] #unified-back-forward-button > #forward-button:hover:active:not([disabled]),
+toolbar[mode="icons"][iconsize="small"] #unified-back-forward-button > #forward-button[open="true"] {
+  -moz-image-region: rect(46px, 649px, 69px, 616px);
+}
+
+toolbar[mode="icons"][iconsize="small"] #unified-back-forward-button > #forward-button[chromedir="rtl"]:hover:active:not([disabled]),
+toolbar[mode="icons"][iconsize="small"] #unified-back-forward-button > #forward-button[open="true"][chromedir="rtl"] {
+  -moz-image-region: rect(46px, 630px, 69px, 597px);
 }
 
 /* ----- SMALL BACK/FORWARD DROPMARKER ----- */	
 
-toolbar[iconsize="small"][mode="icons"] #back-forward-dropmarker {
-  -moz-image-region: rect(0px, 664px, 23px, 649px) !important;
+toolbar[iconsize="small"] #unified-back-forward-button > #back-forward-dropmarker {
+  -moz-image-region: rect(0px, 664px, 23px, 649px);
 }
 
-toolbar[iconsize="small"][mode="icons"] #back-forward-dropmarker[disabled="true"] {
- -moz-image-region: rect(23px, 664px, 46px, 649px) !important;
+toolbar[iconsize="small"] #unified-back-forward-button > #back-forward-dropmarker[chromedir="rtl"] {
+  -moz-image-region: rect(0px, 596px, 23px, 582px);
 }
 
-toolbar[iconsize="small"][mode="icons"] #back-forward-dropmarker:hover:active:not([disabled]),
-toolbar[iconsize="small"][mode="icons"] #back-forward-dropmarker[open="true"] {
-  -moz-image-region: rect(46px, 664px, 69px, 649px) !important;
+toolbar[iconsize="small"] #unified-back-forward-button > #back-forward-dropmarker[disabled="true"] {
+ -moz-image-region: rect(23px, 664px, 46px, 649px);
+}
+
+toolbar[iconsize="small"] #unified-back-forward-button > #back-forward-dropmarker[disabled="true"][chromedir="rtl"] {
+ -moz-image-region: rect(23px, 596px, 46px, 582px);
+}
+
+toolbar[iconsize="small"] #unified-back-forward-button > #back-forward-dropmarker:hover:active:not([disabled]),
+toolbar[iconsize="small"] #unified-back-forward-button > #back-forward-dropmarker[open="true"] {
+  -moz-image-region: rect(46px, 664px, 69px, 649px);
+}
+
+toolbar[iconsize="small"] #unified-back-forward-button > #back-forward-dropmarker[chromedir="rtl"]:hover:active:not([disabled]),
+toolbar[iconsize="small"] #unified-back-forward-button > #back-forward-dropmarker[open="true"][chromedir="rtl"] {
+  -moz-image-region: rect(46px, 596px, 69px, 582px);
 }
 
 /* ----- DEFAULT RELOAD BUTTON ----- */	
@@ -658,7 +772,9 @@ toolbar[iconsize="small"][mode="icons"] #back-forward-dropmarker[open="true"] {
 
 #window-controls {
   -moz-box-align: center;
-  padding: 0 2px 0 4px;
+  padding: 0;
+  -moz-padding-start: 4px;
+  -moz-padding-end: 2px;
 }
 
 #minimize-button {
@@ -675,6 +791,7 @@ toolbar[iconsize="small"][mode="icons"] #back-forward-dropmarker[open="true"] {
 
 #urlbar {
   -moz-appearance: none;
+  direction: ltr !important;
   border: none;
   background: url("chrome://browser/skin/urlbar/endcap.png") transparent right center no-repeat;
   margin: 0px 4px 1px 4px;
@@ -730,10 +847,20 @@ toolbar[iconsize="small"][mode="icons"] #back-forward-dropmarker[open="true"] {
   cursor: -moz-grab;
 }
 
+#wrapper-urlbar-container[place="palette"] {
+  max-width: 20em;
+}
+
+#wrapper-urlbar-container > #urlbar-container > #urlbar > #identity-box > hbox > #identity-icon-label,
 #wrapper-urlbar-container #urlbar > .autocomplete-history-dropmarker {
   display: none;
 }
 
+#wrapper-urlbar-container > #urlbar-container > #urlbar > #identity-box.verifiedIdentity  > hbox > #identity-icon-label,
+#wrapper-urlbar-container > #urlbar-container > #urlbar > #identity-box.verifiedDomain > hbox > #identity-icon-label {
+  display: -moz-box;
+}
+
 /* Keep the URL bar LTR */
 
 #PopupAutoCompleteRichResult {
@@ -776,7 +903,7 @@ toolbar[iconsize="small"][mode="icons"] #back-forward-dropmarker[open="true"] {
 }
 
 statusbarpanel#statusbar-display {
-  padding-left: 0;
+  -moz-padding-start: 0;
 }
 
 .statusbarpanel-text {
@@ -797,6 +924,12 @@ statusbarpanel#statusbar-display {
   height: 16px;
 }
 
+richlistitem[selected="true"][current="true"] > hbox > .ac-result-type-bookmark,
+.autocomplete-treebody::-moz-tree-image(selected, current, bookmark, treecolAutoCompleteImage) {
+  list-style-image: url("chrome://browser/skin/places/star-icons.png");
+  -moz-image-region: rect(32px, 16px, 48px, 0px);
+}
+
 .ac-result-type-tag,
 .autocomplete-treebody::-moz-tree-image(tag, treecolAutoCompleteImage) {
   list-style-image: url("chrome://browser/skin/places/tag.png");
@@ -805,7 +938,7 @@ statusbarpanel#statusbar-display {
 }
 
 .ac-comment {
-  font-size: 1.15em;
+  font-size: 1.1em;
 }
 
 .ac-extra > .ac-comment {
@@ -813,7 +946,8 @@ statusbarpanel#statusbar-display {
 }
 
 .ac-url-text {
-  color: #336633;
+  color: #144fae;
+  font-size: 0.95em;
 }
 
 .autocomplete-treebody::-moz-tree-cell-text(treecolAutoCompleteComment) {
@@ -906,7 +1040,7 @@ statusbarpanel#statusbar-display {
 }
 
 #editBookmarkPanel > hbox {
- padding-right: 1px;
+  -moz-padding-end: 1px;
 }
 
 /**** HUD style buttons ****/
@@ -968,9 +1102,11 @@ statusbarpanel#statusbar-display {
 #editBookmarkPanel #editBMPanel_newFolderButton {
   -moz-appearance: none;
   background-color: transparent !important;
-  border-width: 0 3px 0 0;
+  border: 0;
+  -moz-border-end-width: 3px;
   border-style: solid;
   -moz-border-right-colors: rgba(255,255,255,0.15) rgba(0,0,0,0.5) rgba(255,255,255,0.15);
+  -moz-border-left-colors: rgba(255,255,255,0.15) rgba(0,0,0,0.5) rgba(255,255,255,0.15);
   padding: 0 9px;
   margin: 0;
   min-width: 21px;
@@ -1050,7 +1186,7 @@ statusbarpanel#statusbar-display {
 
 #editBookmarkPanel #editBMPanel_folderTree:focus {
   outline: 2px solid -moz-mac-focusring;
-  outline-offset: -2px;
+  outline-offset: -1px;
   -moz-outline-radius: 1px;
 }
 
@@ -1147,7 +1283,8 @@ statusbarpanel#statusbar-display {
   -moz-border-left-colors: rgba(0,0,0,0.35) rgba(26,26,26,0.5) rgba(255,255,255,0.4);
   -moz-margin-start: 4px;
   -moz-margin-end: 2px;
-  padding: 0 0 0 4px;
+  padding: 0;
+  -moz-padding-start: 4px;
   min-width: 10px;
   min-height: 22px;
   color: #ffffff !important;
@@ -1184,7 +1321,7 @@ statusbarpanel#statusbar-display {
 /**** name picker ****/
 
 #editBookmarkPanel #editBMPanel_namePicker[droppable="false"] {
-  color: #ffffff !important;
+  color: #ffffff;
 }
 
 #editBookmarkPanel #editBMPanel_namePicker[droppable="false"] > .menulist-dropmarker {
@@ -1216,6 +1353,8 @@ statusbarpanel#statusbar-display {
   outline: 2px solid -moz-mac-focusring;
   outline-offset: -1px;
   -moz-outline-radius: 1px;
+  background-color: #eeeeee;
+  color: #000000;
 }
 
 #editBookmarkPanel #editBMPanel_namePicker[droppable="false"][disabled="true"] > .menulist-editable-box {
@@ -1227,10 +1366,14 @@ statusbarpanel#statusbar-display {
   border: none !important;
   padding: 0px !important;
   background-color: inherit;
-  color: #ffffff !important;
+  color: #ffffff;
   font: inherit;
 }
 
+#editBookmarkPanel #editBMPanel_namePicker[droppable="false"][focused="true"] > .menulist-editable-box > html|*.menulist-editable-input {
+  color: #000000;
+}
+
 #editBookmarkPanel > #editBookmarkPanelContent > #editBookmarkPanelGrid > rows > row > label {
   text-align: right;
 }
@@ -1238,7 +1381,7 @@ statusbarpanel#statusbar-display {
 /* ----- SIDEBAR ELEMENTS ----- */
 
 sidebarheader { 
-  background-color: #d6dde5;
+  background-color: #d4dde5;
   padding: 2px;
   text-transform: uppercase;
 }
@@ -1249,12 +1392,11 @@ sidebarheader {
 }
 
 #sidebar-splitter {
-	 border-left: none !important;
-     border-right: 1px solid #404040;
-     min-width: 1px;
-     width: 1px;
-     background-image: none !important;
-         
+  -moz-border-start: none;
+  -moz-border-end: 1px solid #404040;
+  min-width: 1px;
+  width: 1px;
+  background-image: none !important;       
 } 
 
 #sidebar-title {
@@ -1370,6 +1512,10 @@ toolbar[mode="text"] #navigator-throbber[busy="true"] {
   list-style-image: url("chrome://global/skin/icons/loading_16.png");
 }
 
+#wrapper-throbber-box > #throbber-box > #navigator-throbber {
+  list-style-image: url("chrome://global/skin/icons/notloading_16.png");
+}
+
 toolbarbutton.chevron {
   list-style-image: url("chrome://global/skin/icons/chevron.png") !important;
 }
@@ -1380,7 +1526,7 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
 }
 
 #nav-bar {
-  background-color: #9B9B9B;
+  background-color: #9e9e9e;
   border-top: none;
   border-bottom: 1px solid rgba(0,0,0,0.35);
   background-image: url("chrome://global/skin/toolbar/toolbar-background.gif");
@@ -1469,19 +1615,23 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
   padding: 0px;
 }
 
-.tabbrowser-tab > .tab-image-right {
+.tabbrowser-tab > .tab-image-right,
+.tabbrowser-tab[chromedir="rtl"] > .tab-image-left {
   background: url("chrome://browser/skin/tabbrowser/tab-right.png") no-repeat;
 }
 
-.tabbrowser-tab:not([selected="true"]) > .tab-image-right {
+.tabbrowser-tab:not([selected="true"]) > .tab-image-right,
+.tabbrowser-tab:not([selected="true"])[chromedir="rtl"] > .tab-image-left {
   background: url("chrome://browser/skin/tabbrowser/tab-right-bkgnd.png") no-repeat;
 }
 
-.tabbrowser-tab > .tab-image-left {
+.tabbrowser-tab > .tab-image-left,
+.tabbrowser-tab[chromedir="rtl"] > .tab-image-right {
   background: url("chrome://browser/skin/tabbrowser/tab-left.png") no-repeat;
 }
 
-.tabbrowser-tab:not([selected="true"]) > .tab-image-left {
+.tabbrowser-tab:not([selected="true"]) > .tab-image-left,
+.tabbrowser-tab:not([selected="true"])[chromedir="rtl"] > .tab-image-right {
   background: url("chrome://browser/skin/tabbrowser/tab-left-bkgnd.png") no-repeat;
 }
 
@@ -1576,6 +1726,11 @@ tabbrowser > tabbox > tabpanels {
   cursor: default;
 }
 
+.tab-close-button:hover,
+.tabbrowser-tab[selected="true"] > .tab-close-button:hover {
+  list-style-image: url("chrome://global/skin/icons/closetab-hover.png");
+}
+
 .tab-close-button:hover:active,
 .tabbrowser-tab[selected="true"] > .tab-close-button:hover:active {
   list-style-image: url("chrome://global/skin/icons/closetab-active.png");
@@ -1596,32 +1751,64 @@ tabbrowser > tabbox > tabpanels {
   background-image: url("chrome://browser/skin/tabbrowser/tab-middle-bkgnd.png");
 }
 
-.tabbrowser-arrowscrollbox > .scrollbutton-up {
-  background: url("chrome://browser/skin/tabbrowser/tab-arrow-start-bkgnd.png") top right no-repeat;
+.tabbrowser-arrowscrollbox > .scrollbutton-up,
+.tabbrowser-arrowscrollbox > .scrollbutton-down-stack > .scrollbutton-down[chromedir="rtl"] {
+  border: 0;
+  border-right: 2px solid;
+  -moz-border-right-colors: rgba(0,0,0,0.25) rgba(255,255,255,0.15);
   list-style-image: url("chrome://browser/skin/tabbrowser/tab-arrow-start.png");
   -moz-image-region: rect(0px, 7px, 11px, 0px);
-  -moz-padding-start: 0;
-  -moz-padding-end: 2px; 
+  padding: 0;
   width: 16px;
   margin: 0;
 }
 
-.tabbrowser-arrowscrollbox > .scrollbutton-up[disabled="true"] {
-  -moz-image-region: rect(0px, 28px, 11px, 21px);
+.tabbrowser-arrowscrollbox > .scrollbutton-down-stack > .scrollbutton-down[chromedir="rtl"] {
+  -moz-border-end: none;
 }
 
-.tabbrowser-arrowscrollbox .scrollbutton-down {
-  background: url("chrome://browser/skin/tabbrowser/tab-arrow-end-bkgnd.png") top left no-repeat;
+.tabbrowser-arrowscrollbox > .scrollbutton-up:hover {
+  background-color: rgba(0,0,0,0.10);
+}
+
+.tabbrowser-arrowscrollbox > .scrollbutton-up:hover:active {
+  background-color: rgba(0,0,0,0.20);
+}
+
+.tabbrowser-arrowscrollbox > .scrollbutton-up[disabled="true"],
+.tabbrowser-arrowscrollbox > .scrollbutton-down-stack > .scrollbutton-down[disabled="true"][chromedir="rtl"] {
+  -moz-image-region: rect(0px, 28px, 11px, 21px);
+  background-color: transparent !important; 
+}
+
+.tabbrowser-arrowscrollbox .scrollbutton-down,
+.tabbrowser-arrowscrollbox > .scrollbutton-up[chromedir="rtl"] {
+  border-left: 2px solid;
+  -moz-border-left-colors: rgba(0,0,0,0.25) rgba(255,255,255,0.15);
   list-style-image: url("chrome://browser/skin/tabbrowser/tab-arrow-end.png");
   -moz-image-region: rect(0px, 44px, 11px, 37px);
   -moz-padding-start: 2px;
-  -moz-padding-end: 0; 
+  -moz-padding-end: 0;
   width: 16px;
   margin: 0;
 }
 
-.tabbrowser-arrowscrollbox .scrollbutton-down[disabled="true"] {
+.tabbrowser-arrowscrollbox > .scrollbutton-up[chromedir="rtl"] {
+  -moz-border-start: none;
+}
+
+.tabbrowser-arrowscrollbox .scrollbutton-down:hover {
+  background-color: rgba(0,0,0,0.10);
+}
+
+.tabbrowser-arrowscrollbox .scrollbutton-down:hover:active {
+  background-color: rgba(0,0,0,0.20);
+}
+
+.tabbrowser-arrowscrollbox > .scrollbutton-down-stack > .scrollbutton-down[disabled="true"],
+.tabbrowser-arrowscrollbox > .scrollbutton-up[disabled="true"][chromedir="rtl"] {
   -moz-image-region: rect(0px, 23px, 11px, 16px);
+  background-color: transparent !important;
 }
 
 
@@ -1636,8 +1823,9 @@ tabbrowser > tabbox > tabpanels {
 
 .tabs-alltabs-button {
   list-style-image: url("chrome://browser/skin/tabbrowser/alltabs-box-bkgnd-icon.png");
-  border-left: 2px solid;
+  -moz-border-start: 2px solid;
   -moz-border-left-colors: rgba(0,0,0,0.25) rgba(255,255,255,0.15);
+  -moz-border-right-colors: rgba(0,0,0,0.25) rgba(255,255,255,0.15);
   margin: 0;
   padding-left: 0;
   padding-right: 0;
@@ -1663,8 +1851,8 @@ tabbrowser > tabbox > tabpanels {
 }
 
 .tabs-alltabs-box-animate {
-  margin: 2px 0px 3px 0px;
-  width: 16px;
+  margin: 1px 0px 0px 0px;
+  width: 25px;
   background-image: url("chrome://browser/skin/tabbrowser/alltabs-box-overflow-bkgnd-animate.png");
   background-repeat: no-repeat;
   opacity: 0.0;
@@ -1708,17 +1896,16 @@ tabpanels.plain {
 
 /* Personal toolbar */
 .toolbar-drop-indicator {
-  width: 9px;
-  height: 18px;
-  margin-bottom: -6px;
+  width: 7px;
+  height: 17px;
   position: relative;
-  background: url('chrome://browser/skin/places/toolbarDropMarker.png') 50% 50% no-repeat;
+  background: url('chrome://browser/skin/places/toolbarDropMarker.png') 40% 50% no-repeat;
 }
 
 .toolbar-drop-indicator-bar {
   visibility: hidden;
-  height: 18px;
-  margin-bottom: -18px;
+  height: 17px;
+  margin-bottom: -17px;
   position: relative;
 }
 
@@ -1726,13 +1913,8 @@ tabpanels.plain {
   visibility: visible;
 }
 
-toolbarbutton.bookmark-item[dragover="true"][open="true"] {
-  -moz-appearance: none;
-  background: Highlight !important;
-  color: HighlightText !important;
-}
-
 /* Bookmark drag and drop styles */
+
 .bookmark-item[dragover-into="true"] {
   background: Highlight !important;
   color: HighlightText !important;
@@ -1879,14 +2061,13 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
 #identity-popup-encryption-label {
   white-space: pre-wrap;
   color: #ffffff;
-  padding-left: 15px;
+  -moz-padding-start: 15px;
   margin: 2px 0 4px;
 }
 
 #identity-popup-content-box > label {
   white-space: pre-wrap;
-  margin-left: 0;
-  padding-left: 15px;
+  -moz-padding-start: 15px;
   margin: 0;
 }
 
@@ -1912,7 +2093,7 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
 #identity-popup-content-box.verifiedIdentity > #identity-popup-encryption ,
 #identity-popup-content-box.verifiedDomain > #identity-popup-encryption {
   margin-top: 10px;
-  margin-left: -24px;
+  -moz-margin-start: -24px;
 }
 
 #identity-popup-content-box.verifiedIdentity > #identity-popup-encryption > vbox > #identity-popup-encryption-icon ,
@@ -1945,7 +2126,6 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
   -moz-appearance: none;
   background: url("chrome://browser/skin/hud-style-button-middle-background.png") repeat-x #464646 center center;
   border: 3px solid;
-  -moz-border-radius: 5px;
   -moz-border-top-colors: rgba(0,0,0,0.35) rgba(26,26,26,0.5) rgba(255,255,255,0.4);
   -moz-border-right-colors: rgba(53,53,53,1) rgba(53,53,53,1) rgba(162,162,162,1);
   -moz-border-bottom-colors: rgba(128,128,128,0.35) rgba(0,0,0,0.5) rgba(255,255,255,0.15);

browser/themes/pinstripe/browser/browser.xml

@@ -23,7 +23,7 @@
   </binding>
    <binding id="toolbarbutton-menu-shadow" display="xul:menu" 
            extends="chrome://global/content/bindings/toolbarbutton.xml#toolbarbutton">
-    <content>
+    <content chromedir="&locale.dir;">
       <children includes="observes|template|menupopup|tooltip"/>
       <xul:image class="toolbarbutton-icon" xbl:inherits="validate,src=image,toolbarmode,buttonstyle"/>
       <xul:stack class="toolbarbutton-text-stack" crop="right" flex="1">
@@ -32,11 +32,11 @@
          <xul:label class="toolbarbutton-text" crop="right" flex="1"
                  xbl:inherits="value=label,accesskey,crop,dragover-top,toolbarmode,buttonstyle"/>
       </xul:stack>
-      <xul:dropmarker type="menu" class="toolbarbutton-menu-dropmarker" xbl:inherits="disabled,label"/>
+      <xul:dropmarker type="menu" class="toolbarbutton-menu-dropmarker" xbl:inherits="disabled,label,chromedir"/>
     </content>
   </binding>
   <binding id="toolbarbutton-shadow" extends="chrome://global/content/bindings/toolbarbutton.xml#toolbarbutton">
-   <content>
+   <content chromedir="&locale.dir;">
       <children includes="observes|template|menupopup|tooltip"/>
       <xul:image class="toolbarbutton-icon" xbl:inherits="validate,src=image,toolbarmode,buttonstyle"/>
       <xul:stack class="toolbarbutton-text-stack" crop="right" flex="1">

browser/themes/pinstripe/browser/jar.mn

@@ -28,6 +28,8 @@ classic.jar:
   skin/classic/browser/hud-style-twisties.png
   skin/classic/browser/identity.png
   skin/classic/browser/Info.png
+  skin/classic/browser/menu-back.png
+  skin/classic/browser/menu-forward.png
   skin/classic/browser/page-livemarks.png
   skin/classic/browser/livemark-item.png
   skin/classic/browser/pageInfo.css
@@ -47,6 +49,7 @@ classic.jar:
   skin/classic/browser/Secure-statusbar-broken.png
   skin/classic/browser/Secure-background.gif
   skin/classic/browser/Toolbar.png
+  skin/classic/browser/Toolbar-rtl.png
   skin/classic/browser/feeds/subscribe.css                  (feeds/subscribe.css)
   skin/classic/browser/feeds/feedIcon.png                   (feeds/feedIcon.png)
   skin/classic/browser/feeds/feedIcon16.png                 (feeds/feedIcon16.png)
@@ -59,6 +62,7 @@ classic.jar:
   skin/classic/browser/monitor.png
   skin/classic/browser/monitor_16-10.png
   skin/classic/browser/wrench.png
+  skin/classic/browser/places/allBookmarks.png              (places/allBookmarks.png)
   skin/classic/browser/places/places.css                    (places/places.css)
 * skin/classic/browser/places/organizer.css                 (places/organizer.css)
   skin/classic/browser/places/query.png                     (places/query.png)
@@ -67,47 +71,48 @@ classic.jar:
   skin/classic/browser/places/bookmarksToolbar.png          (places/bookmarksToolbar.png)
   skin/classic/browser/places/history.png                   (places/history.png)
   skin/classic/browser/places/menubutton-end-pressed.png    (places/menubutton-end-pressed.png)
+  skin/classic/browser/places/menubutton-end-pressed-rtl.png (places/menubutton-end-pressed-rtl.png)
   skin/classic/browser/places/menubutton-mid-pressed.png    (places/menubutton-mid-pressed.png)
   skin/classic/browser/places/menubutton-start-pressed.png  (places/menubutton-start-pressed.png)
+  skin/classic/browser/places/menubutton-start-pressed-rtl.png (places/menubutton-start-pressed-rtl.png)
   skin/classic/browser/places/star-icons.png                (places/star-icons.png)
   skin/classic/browser/places/toolbar-button-backup.png     (places/toolbar-button-backup.png)
   skin/classic/browser/places/toolbar-button-organize.png   (places/toolbar-button-organize.png)
   skin/classic/browser/places/toolbar-button-view.png       (places/toolbar-button-view.png)
   skin/classic/browser/places/toolbarDropMarker.png         (places/toolbarDropMarker.png)
   skin/classic/browser/places/folderDropArrow.png           (places/folderDropArrow.png)
-  skin/classic/browser/places/infoPaneGrippy.png            (places/infoPaneGrippy.png)
-  skin/classic/browser/places/folderDropHoverArrow.png      (places/folderDropHoverArrow.png)
   skin/classic/browser/places/livemarkFolder.png            (places/livemarkFolder.png)
-  skin/classic/browser/places/livemarkFolderHover.png       (places/livemarkFolderHover.png)
   skin/classic/browser/places/back-forward.png              (places/back-forward.png)
   skin/classic/browser/places/bookmarkProperties.css        (places/bookmarkProperties.css)
-  skin/classic/browser/places/contentSplitter-bg.gif        (places/contentSplitter-bg.gif)
   skin/classic/browser/places/editBookmarkOverlay.css       (places/editBookmarkOverlay.css)
   skin/classic/browser/places/menubutton-start.png          (places/menubutton-start.png)
+  skin/classic/browser/places/menubutton-start-rtl.png      (places/menubutton-start-rtl.png)
   skin/classic/browser/places/menubutton-end.png            (places/menubutton-end.png)
-  skin/classic/browser/places/menubutton-mid.png            (places/menubutton-mid.png)
-  skin/classic/browser/places/minus.png						(places/minus.png)
-  skin/classic/browser/places/minus-active.png				(places/minus-active.png)
-  skin/classic/browser/places/plus.png						(places/plus.png)
-  skin/classic/browser/places/plus-active.png				(places/plus-active.png)
+  skin/classic/browser/places/menubutton-end-rtl.png        (places/menubutton-end-rtl.png)
+  skin/classic/browser/places/minus.png                     (places/minus.png)
+  skin/classic/browser/places/minus-active.png              (places/minus-active.png)
+  skin/classic/browser/places/plus.png                      (places/plus.png)
+  skin/classic/browser/places/plus-active.png               (places/plus-active.png)
   skin/classic/browser/places/starPage.png                  (places/starPage.png)
   skin/classic/browser/places/pageStarred.png               (places/pageStarred.png)
   skin/classic/browser/places/searching_16.png              (places/searching_16.png)
   skin/classic/browser/places/starred48.png                 (places/starred48.png)
   skin/classic/browser/places/unstarred48.png               (places/unstarred48.png)
+  skin/classic/browser/places/unfiledBookmarks.png          (places/unfiledBookmarks.png)
   skin/classic/browser/places/twisty-open.gif               (places/twisty-open.gif)
   skin/classic/browser/places/twisty-closed.gif             (places/twisty-closed.gif)
   skin/classic/browser/places/tag.png                       (places/tag.png)
   skin/classic/browser/places/selected-gradient.png         (places/selected-gradient.png)
   skin/classic/browser/places/selected-focused-gradient.png (places/selected-focused-gradient.png)
-  skin/classic/browser/places/organizer-toolbar.png         (bookmarks/Bookmarks-toolbar.png)
-  skin/classic/browser/places/expander-closed-active.png    (bookmarks/expander-closed-active.png)
-  skin/classic/browser/places/expander-closed.png           (bookmarks/expander-closed.png)
-  skin/classic/browser/places/expander-open-active.png      (bookmarks/expander-open-active.png)
-  skin/classic/browser/places/expander-open.png             (bookmarks/expander-open.png)
+  skin/classic/browser/places/expander-closed-active.png    (places/expander-closed-active.png)
+  skin/classic/browser/places/expander-closed.png           (places/expander-closed.png)
+  skin/classic/browser/places/expander-open-active.png      (places/expander-open-active.png)
+  skin/classic/browser/places/expander-open.png             (places/expander-open.png)
+  skin/classic/browser/preferences/alwaysAsk.png            (preferences/alwaysAsk.png)
   skin/classic/browser/preferences/application.png          (preferences/application.png)
   skin/classic/browser/preferences/Options.png              (preferences/Options.png)
   skin/classic/browser/preferences/plugin.png               (preferences/plugin.png)
+  skin/classic/browser/preferences/saveFile.png             (preferences/saveFile.png)
   skin/classic/browser/preferences/preferences.css          (preferences/preferences.css)
   skin/classic/browser/preferences/applications.css         (preferences/applications.css)
   skin/classic/browser/tabbrowser/alltabs-box-bkgnd.png                  (tabbrowser/alltabs-box-bkgnd.png)
@@ -136,9 +141,13 @@ classic.jar:
   skin/classic/browser/tabbrowser/tab-right-inactive.png                 (tabbrowser/tab-right-inactive.png)
   skin/classic/browser/tabbrowser/tabs-bottom-bg.png                     (tabbrowser/tabs-bottom-bg.png)
   skin/classic/browser/urlbar/endcap.png                                 (urlbar/endcap.png)
+  skin/classic/browser/urlbar/endcap-rtl.png                             (urlbar/endcap-rtl.png)
   skin/classic/browser/urlbar/endcap-focused.png                         (urlbar/endcap-focused.png)
+  skin/classic/browser/urlbar/endcap-focused-rtl.png                     (urlbar/endcap-focused-rtl.png)
   skin/classic/browser/urlbar/startcap.png                               (urlbar/startcap.png)
+  skin/classic/browser/urlbar/startcap-rtl.png                           (urlbar/startcap-rtl.png)
   skin/classic/browser/urlbar/startcap-focused.png                       (urlbar/startcap-focused.png)
+  skin/classic/browser/urlbar/startcap-focused-rtl.png                   (urlbar/startcap-focused-rtl.png)
   skin/classic/browser/urlbar/startcap-secure-start.png                  (urlbar/startcap-secure-start.png)
   skin/classic/browser/urlbar/startcap-secure-mid.png                    (urlbar/startcap-secure-mid.png)
   skin/classic/browser/urlbar/startcap-secure-end.png                    (urlbar/startcap-secure-end.png)
@@ -153,6 +162,9 @@ classic.jar:
   skin/classic/browser/urlbar/startcap-verified-end-focused.png          (urlbar/startcap-verified-end-focused.png)
   skin/classic/browser/urlbar/startcap-secure.png                        (urlbar/startcap-secure.png)
   skin/classic/browser/urlbar/startcap-active.png                        (urlbar/startcap-active.png)
+  skin/classic/browser/urlbar/startcap-active-rtl.png                    (urlbar/startcap-active-rtl.png)
+  skin/classic/browser/urlbar/startcap-active-focused.png                (urlbar/startcap-active-focused.png)
+  skin/classic/browser/urlbar/startcap-active-focused-rtl.png            (urlbar/startcap-active-focused-rtl.png)
   skin/classic/browser/urlbar/startcap-secure-active.png                 (urlbar/startcap-secure-active.png)
   skin/classic/browser/urlbar/textfield-mid.png                          (urlbar/textfield-mid.png)
   skin/classic/browser/urlbar/textfield-mid-focused.png                  (urlbar/textfield-mid-focused.png)

browser/themes/pinstripe/browser/places/organizer.css

@@ -17,6 +17,20 @@
   border-color: transparent;
 }
 
+#placesList treechildren::-moz-tree-row(selected) {  
+  background-color: #6f81a9;
+  background-image: url("chrome://browser/skin/places/selected-gradient.png");
+  background-repeat: repeat-x;
+  background-position: bottom left;
+  border-top: 1px solid #979797;
+}
+
+#placesList treechildren::-moz-tree-row(selected,focus) {  
+  background-image: url("chrome://browser/skin/places/selected-focused-gradient.png");
+  background-color: #8a8a8a !important;
+  border-top: 1px solid #91a0c0;
+}
+
 #placesList treechildren::-moz-tree-row(History),
 #placesList treechildren::-moz-tree-row(history)  {
   background-color: blue;
@@ -36,6 +50,16 @@
   cursor: default;
 }
 
+#placesList treechildren::-moz-tree-separator {
+  border-top: 1px solid #505d6d;
+  margin: 0 10px;
+}
+
+#placesList treechildren::-moz-tree-cell-text(selected) {  
+  font-weight: bold !important;
+  color: #ffffff !important;
+}
+
 #placesToolbar {
   background-color: #999;
   border-bottom: 1px solid #404040;
@@ -51,17 +75,20 @@
 }
 
 #placesView > splitter {
-  border-left: none !important;
-  border-right: 1px solid #404040;
+  -moz-border-start: none !important;
+  -moz-border-end: 1px solid #404040;
   min-width: 1px;
   width: 1px;
   background-image: none !important;       
-} 
+}
+
+.toolbarbutton-1 {
+  list-style-image: url("chrome://browser/skin/places/back-forward.png");
+}
 
 /* back button */
 
 #back-button {
-  list-style-image: url("chrome://browser/skin/places/back-forward.png");
   -moz-image-region: rect(0px, 34px, 23px, 0px);
   -moz-margin-end: 0;
   -moz-padding-end: 0;
@@ -69,16 +96,30 @@
   border-right: none;
 }
 
+#back-button[chromedir="rtl"] {
+  -moz-image-region: rect(0px, 67px, 23px, 34px);
+}
+
 #back-button[disabled="true"] {
  -moz-image-region: rect(23px, 34px, 46px, 0px) !important;
 }
 
+#back-button[disabled="true"][chromedir="rtl"] {
+ -moz-image-region: rect(23px, 67px, 46px, 34px) !important;
+}
+
 #back-button:hover:active,
 #back-button[buttondown="true"],
 #back-button[open="true"] {
   -moz-image-region: rect(46px, 34px, 69px, 0px);
 }
 
+#back-button:hover:active[chromedir="rtl"],
+#back-button[buttondown="true"][chromedir="rtl"],
+#back-button[open="true"][chromedir="rtl"] {
+  -moz-image-region: rect(46px, 67px, 69px, 34px);
+}
+
 #back-button > .toolbarbutton-text,
 #forward-button > .toolbarbutton-text {
   display: none;
@@ -87,7 +128,6 @@
 /* forward button */
 
 #forward-button {
-  list-style-image: url("chrome://browser/skin/places/back-forward.png");
   -moz-image-region: rect(0px, 67px, 23px, 34px);
   -moz-margin-start: 0;
   -moz-margin-end: 8px;
@@ -96,8 +136,16 @@
   border-right: none;
 }
 
+#forward-button[chromedir="rtl"] {
+  -moz-image-region: rect(0px, 34px, 23px, 0px);
+}
+
 #forward-button[disabled="true"] {
- -moz-image-region: rect(23px, 67px, 46px, 34px) !important;
+  -moz-image-region: rect(23px, 67px, 46px, 34px) !important;
+}
+
+#forward-button[disabled="true"][chromedir="rtl"] {
+  -moz-image-region: rect(23px, 34px, 46px, 0px) !important;
 }
 
 #forward-button:hover:active,
@@ -106,13 +154,26 @@
   -moz-image-region: rect(46px, 67px, 69px, 34px);
 }
 
+#forward-button:hover:active[chromedir="rtl"],
+#forward-button[buttondown="true"][chromedir="rtl"],
+#forward-button[open="true"][chromedir="rtl"] {
+  -moz-image-region: rect(46px, 34px, 69px, 0px);
+}
+
 #placesToolbar > toolbarbutton[type="menu"] {
   -moz-margin-start: 5px;
   -moz-padding-end: 10px;
-  background: url("chrome://browser/skin/places/menubutton-end.png") center right no-repeat;
+  background: url("chrome://browser/skin/places/menubutton-end.png") right center no-repeat;
 }
 #placesToolbar > toolbarbutton[type="menu"][open="true"] {
-  background: url("chrome://browser/skin/places/menubutton-end-pressed.png") center right no-repeat;
+  background: url("chrome://browser/skin/places/menubutton-end-pressed.png") right center no-repeat;
+}
+
+#placesToolbar[chromedir="rtl"] > toolbarbutton[type="menu"] {
+  background: url("chrome://browser/skin/places/menubutton-end-rtl.png") left center no-repeat;
+}
+#placesToolbar[chromedir="rtl"] > toolbarbutton[type="menu"][open="true"] {
+  background: url("chrome://browser/skin/places/menubutton-end-pressed-rtl.png") left center no-repeat;
 }
 
 #placesToolbar > toolbarbutton[type="menu"] > menupopup {
@@ -121,12 +182,21 @@
 }
 
 #placesToolbar > toolbarbutton[type="menu"] > .toolbarbutton-icon {
-  background: url("chrome://browser/skin/places/menubutton-start.png") center left no-repeat;
-  padding: 3px 4px 4px 10px;
+  background: url("chrome://browser/skin/places/menubutton-start.png") left center no-repeat;
+  padding: 3px 0px 4px 0px;
+  -moz-padding-start: 10px;
+  -moz-padding-end: 4px;
   height: 23px;
 }
 #placesToolbar > toolbarbutton[type="menu"][open="true"] > .toolbarbutton-icon {
-  background: url("chrome://browser/skin/places/menubutton-start-pressed.png") center left no-repeat;
+  background: url("chrome://browser/skin/places/menubutton-start-pressed.png") left center no-repeat;
+}
+
+#placesToolbar[chromedir="rtl"] > toolbarbutton[type="menu"] > .toolbarbutton-icon {
+  background: url("chrome://browser/skin/places/menubutton-start-rtl.png") right center no-repeat;
+}
+#placesToolbar[chromedir="rtl"] > toolbarbutton[type="menu"][open="true"] > .toolbarbutton-icon {
+  background: url("chrome://browser/skin/places/menubutton-start-pressed-rtl.png") right center no-repeat;
 }
 
 #placesToolbar > toolbarbutton[type="menu"] > .toolbarbutton-text {
@@ -220,7 +290,9 @@
 
 /* Search Bar */
 #searchbar {
-  margin: 6px -4px 0px 2px;
+  margin-top: 6px;
+  -moz-margin-start: 2px;
+  -moz-margin-end: -4px;
 }
 
 .textbox-input-closebutton {

browser/themes/pinstripe/browser/places/places.css

@@ -16,56 +16,44 @@
 #bookmarksPanel > hbox,
 #history-panel > hbox {
   -moz-appearance: none !important;
-  background-color: #d6dde5 !important;
+  background-color: #d4dde5 !important;
   border-top: none !important;
 }
 
-#bookmarks-view,
-#historyTree,
-#historyTree treechildren::-moz-tree-row, 
-#bookmarks-view treechildren::-moz-tree-row {
+tree.sidebar-placesTree,
+tree.sidebar-placesTree treechildren::-moz-tree-row {
   background-color: transparent;
   border-color: transparent;
-  -moz-margin-end: 0;
+  padding-bottom: 1px;
   -moz-appearance: none;
   margin: 0;
   border: none;
 }
 
-#historyTree treechildren::-moz-tree-row, 
-#bookmarks-view treechildren::-moz-tree-row {
-  padding-bottom: 1px;
-}
-
-#historyTree treechildren::-moz-tree-row(selected), 
-#bookmarks-view treechildren::-moz-tree-row(selected) {  
-  background-color: -moz-mac-secondaryhighlight !important;
+#bookmarks-view treechildren::-moz-tree-row(selected), 
+#historyTree treechildren::-moz-tree-row(selected) {  
+  background-color: #6f81a9;
   background-image: url("chrome://browser/skin/places/selected-gradient.png");
   background-repeat: repeat-x;
-  background-position: center left;
+  background-position: bottom left;
+  border-top: 1px solid #979797;
 }
 
-#historyTree treechildren::-moz-tree-separator,
-#bookmarks-view treechildren::-moz-tree-separator {
+tree.sidebar-placesTree treechildren::-moz-tree-separator {
   border-top: 1px solid #505d6d;
   margin: 0 10px;
 }
 
-
-#historyTree treechildren::-moz-tree-row(selected,focus),
 #bookmarks-view treechildren::-moz-tree-row(selected,focus),
-#placesList treechildren::-moz-tree-row(selected,focus) {  
+#historyTree treechildren::-moz-tree-row(selected,focus) {  
   background-image: url("chrome://browser/skin/places/selected-focused-gradient.png");
-  background-color: Highlight !important;
-  color: HighlightText !important;
-  border-top: 1px solid Highlight;
+  background-color: #8a8a8a !important;
+  border-top: 1px solid #91a0c0;
 }
 
-#historyTree treechildren::-moz-tree-cell-text(selected,focus), 
-#bookmarks-view treechildren::-moz-tree-cell-text(selected,focus),
-#placesList treechildren::-moz-tree-cell-text(selected,focus) {  
+tree.sidebar-placesTree treechildren::-moz-tree-cell-text(selected) {  
   font-weight: bold !important;
-  color: HighlightText !important;
+  color: #ffffff !important;
 }
 
 #bookmarksPanel > hbox > label,
@@ -75,32 +63,36 @@
 
 #viewButton {
   -moz-appearance: none;
-  margin: 0 2px !important;
-  padding: 2px 0 2px 7px !important;
-  background: url("chrome://global/skin/icons/round-button-leftcap.png") no-repeat center left !important;
-  border: none;
-}
-
-#viewButton .button-text {
-  margin: 0 !important;
-  padding: 2px 18px 0 1px !important;
-  background: url("chrome://global/skin/icons/round-button-dropmarker.png") no-repeat center right !important;
-  height: 19px;
+  border: 1px solid #7F7F7F;
+  -moz-border-radius: 10px;
+  background: url("chrome://global/skin/icons/white-gray-gradient.gif") #A09E9D repeat-x top center;
+  min-width: 0px;
+  min-height: 0px;
+  -moz-padding-start: 5px;
+  -moz-padding-end: 0px;
+  padding-top: 1px;
+  padding-bottom: 1px;
 }
 
 #viewButton .button-menu-dropmarker {
-  display: none;
+  list-style-image: url("chrome://global/skin/icons/menulist-dropmarker.png");
+}
+
+#viewButton:focus {
+  outline: 2px solid #4A8BC7;
+  outline-offset: -2px;
+  -moz-outline-radius: 10px;
 }
 
 page > hbox {
- margin: 0 4px 6px 4px;
+  margin: 0 4px 6px 4px;
 }
 
 /* Trees */
 
 treechildren::-moz-tree-image(title) {
   list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
-  padding-right: 2px;
+  -moz-padding-end: 2px;
   margin: 0px 2px;
   width: 16px;
   height: 16px;
@@ -127,6 +119,10 @@ treechildren::-moz-tree-row(session-start) {
   border-top:1px dotted ThreeDShadow;
 }
 
+treechildren::-moz-tree-image(container, OrganizerQuery_AllBookmarks) {
+  list-style-image: url("chrome://browser/skin/places/allBookmarks.png");
+}
+
 treechildren::-moz-tree-image(container, livemark) {
   list-style-image: url("chrome://browser/skin/page-livemarks.png");
 }
@@ -139,6 +135,10 @@ treechildren::-moz-tree-image(container, OrganizerQuery_BookmarksMenu) {
   list-style-image: url("chrome://browser/skin/places/bookmarksMenu.png");
 }
 
+treechildren::-moz-tree-image(container, OrganizerQuery_UnfiledBookmarks) {
+  list-style-image: url("chrome://browser/skin/places/unfiledBookmarks.png");
+}
+
 /* query-nodes should be styled even if they're not expandable */
 treechildren::-moz-tree-image(query) {
   list-style-image: url("chrome://browser/skin/places/query.png");