Bug 1534322 - Fix the guids for the mobile and other bookmarks virtual queries. r=mak
authorMark Banner <standard8@mozilla.com>
Mon, 11 Mar 2019 17:56:24 +0000
changeset 521506 5dcadd5237115f3374ff2cad0dc189f517064405
parent 521505 e8c317d99a9981648624d28f9bac5dd6fc7b1ad0
child 521507 e651386473edf4981e41c91f776705324fdc2210
push id10867
push userdvarga@mozilla.com
push dateThu, 14 Mar 2019 15:20:45 +0000
treeherdermozilla-beta@abad13547875 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmak
bugs1534322
milestone67.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1534322 - Fix the guids for the mobile and other bookmarks virtual queries. r=mak Differential Revision: https://phabricator.services.mozilla.com/D23004
toolkit/components/places/Bookmarks.jsm
toolkit/components/places/nsNavHistory.cpp
toolkit/components/places/nsNavHistory.h
--- a/toolkit/components/places/Bookmarks.jsm
+++ b/toolkit/components/places/Bookmarks.jsm
@@ -156,18 +156,18 @@ var Bookmarks = Object.freeze({
   userContentRoots: ["toolbar_____", "menu________", "unfiled_____", "mobile______"],
 
   /**
    * GUIDs associated with virtual queries that are used for displaying bookmark
    * folders in the left pane.
    */
   virtualMenuGuid: "menu_______v",
   virtualToolbarGuid: "toolbar____v",
-  virtualUnfiledGuid: "unfiled___v",
-  virtualMobileGuid: "mobile____v",
+  virtualUnfiledGuid: "unfiled____v",
+  virtualMobileGuid: "mobile_____v",
 
   /**
    * Checks if a guid is a virtual root.
    *
    * @param {String} guid The guid of the item to look for.
    * @returns {Boolean} true if guid is a virtual root, false otherwise.
    */
   isVirtualRootItem(guid) {
--- a/toolkit/components/places/nsNavHistory.cpp
+++ b/toolkit/components/places/nsNavHistory.cpp
@@ -1614,17 +1614,17 @@ nsresult PlacesSQLQueryBuilder::SelectAs
           "VALUES(null, 'place:parent=" TOOLBAR_ROOT_GUID
           "', :BookmarksToolbarFolderTitle, null, null, null, "
           "null, null, 0, 0, null, null, null, null, 'toolbar____v', null), "
           "(null, 'place:parent=" MENU_ROOT_GUID
           "', :BookmarksMenuFolderTitle, null, null, null, "
           "null, null, 0, 0, null, null, null, null, 'menu_______v', null), "
           "(null, 'place:parent=" UNFILED_ROOT_GUID
           "', :OtherBookmarksFolderTitle, null, null, null, "
-          "null, null, 0, 0, null, null, null, null, 'unfiled___v', null) ") +
+          "null, null, 0, 0, null, null, null, null, 'unfiled____v', null) ") +
       mobileString + NS_LITERAL_CSTRING(")");
 
   return NS_OK;
 }
 
 nsresult PlacesSQLQueryBuilder::SelectAsLeftPane() {
   nsNavHistory* history = nsNavHistory::GetHistoryService();
   NS_ENSURE_STATE(history);
--- a/toolkit/components/places/nsNavHistory.h
+++ b/toolkit/components/places/nsNavHistory.h
@@ -55,17 +55,17 @@
     "places-autocomplete-feedback-updated"
 #endif
 
 // The preference we watch to know when the mobile bookmarks folder is filled by
 // sync.
 #define MOBILE_BOOKMARKS_PREF "browser.bookmarks.showMobileBookmarks"
 
 // The guid of the mobile bookmarks virtual query.
-#define MOBILE_BOOKMARKS_VIRTUAL_GUID "mobile____v"
+#define MOBILE_BOOKMARKS_VIRTUAL_GUID "mobile_____v"
 
 #define ROOT_GUID "root________"
 #define MENU_ROOT_GUID "menu________"
 #define TOOLBAR_ROOT_GUID "toolbar_____"
 #define UNFILED_ROOT_GUID "unfiled_____"
 #define TAGS_ROOT_GUID "tags________"
 #define MOBILE_ROOT_GUID "mobile______"