Bug 1689437, respect bookmarks.toolbars.bookmarks pref values to disp…

…lay bookmarks toolbar in skeleton UI r=dthayer Differential Revision: https://phabricator.services.mozilla.com/D103358
dothq · Feb 2, 2021 · 3e25955 · 3e25955
1 parent e2e8e3c
commit 3e25955
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/xpfe/appshell/AppWindow.cpp b/xpfe/appshell/AppWindow.cpp
@@ -1877,9 +1877,13 @@ nsresult AppWindow::MaybeSaveEarlyWindowPersistentValues(
   }
   settings.searchbarSpan = searchbar;
 
-  Element* bookmarksToolbar = doc->GetElementById(u"PersonalToolbar"_ns);
-  bookmarksToolbar->GetAttribute(u"collapsed"_ns, attributeValue);
-  settings.bookmarksToolbarShown = attributeValue.EqualsLiteral("false");
+  nsAutoString bookmarksVisibility;
+  Preferences::GetString("browser.toolbars.bookmarks.visibility",
+                         bookmarksVisibility);
+  settings.bookmarksToolbarShown =
+      bookmarksVisibility.EqualsLiteral("always") ||
+      (Preferences::GetBool("browser.toolbars.bookmarks.2h2020", false) &&
+       bookmarksVisibility.EqualsLiteral("newtab"));
 
   Element* menubar = doc->GetElementById(u"toolbar-menubar"_ns);
   menubar->GetAttribute(u"autohide"_ns, attributeValue);