Merge pull request #3275 from brave/pr3251_show_bookmark_bar_on_ntp_b…

…y_default_0.69.x Show bookmark bar on NTP by default (uplift to 0.69.x)
brave · Aug 30, 2019 · 5a910c5 · 5a910c5
2 parents 82639fd + 9fc5d05
commit 5a910c5
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 25 deletions.
diff --git a/browser/ui/bookmark/bookmark_prefs_service_factory.cc b/browser/ui/bookmark/bookmark_prefs_service_factory.cc
@@ -47,5 +47,5 @@ bool BookmarkPrefsServiceFactory::ServiceIsCreatedWithBrowserContext() const {
 
 void BookmarkPrefsServiceFactory::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
-  registry->RegisterBooleanPref(kAlwaysShowBookmarkBarOnNTP, false);
+  registry->RegisterBooleanPref(kAlwaysShowBookmarkBarOnNTP, true);
 }
diff --git a/browser/ui/bookmark/bookmark_tab_helper_browsertest.cc b/browser/ui/bookmark/bookmark_tab_helper_browsertest.cc
@@ -54,42 +54,44 @@ void AddBookmarkNode(Profile* profile) {
 
 }  // namespace
 
-IN_PROC_BROWSER_TEST_F(BookmarkTabHelperBrowserTest,
-                       BookmarkBarOnNTPToggleTest) {
-  auto* contents = browser()->tab_strip_model()->GetActiveWebContents();
-  EXPECT_TRUE(content::NavigateToURL(contents,
-                                     GURL(chrome::kChromeUINewTabURL)));
-  EXPECT_TRUE(IsNTP(contents));
-  chrome::ToggleBookmarkBar(browser());
-  EXPECT_EQ(BookmarkBar::SHOW, browser()->bookmark_bar_state());
-
-  AddBookmarkNode(browser()->profile());
-
-  chrome::ToggleBookmarkBar(browser());
+IN_PROC_BROWSER_TEST_F(BookmarkTabHelperBrowserTest, BookmarkBarOnNTPTest) {
+  auto* profile = browser()->profile();
 
-  // Check bookmark is still hidden on NTP.
+  // Check Bookmark bar is hidden by default.
   EXPECT_EQ(BookmarkBar::HIDDEN, browser()->bookmark_bar_state());
-}
 
-IN_PROC_BROWSER_TEST_F(BookmarkTabHelperBrowserTest,
-                       AlwaysShowBookmarkBarOnNTPTest) {
-  auto* profile = browser()->profile();
-  // Check default is false.
-  EXPECT_FALSE(profile->GetPrefs()->GetBoolean(kAlwaysShowBookmarkBarOnNTP));
+  // Check default is on.
+  EXPECT_TRUE(profile->GetPrefs()->GetBoolean(kAlwaysShowBookmarkBarOnNTP));
+
+  // Loading NTP.
   auto* contents = browser()->tab_strip_model()->GetActiveWebContents();
   EXPECT_TRUE(content::NavigateToURL(contents,
                                      GURL(chrome::kChromeUINewTabURL)));
   EXPECT_TRUE(IsNTP(contents));
+
+  // Check bookmark bar on NTP is hidden if bookmark bar is empty and
+  // kBookmarkBar is off.
+  EXPECT_EQ(BookmarkBar::HIDDEN, browser()->bookmark_bar_state());
+
   AddBookmarkNode(profile);
-  profile->GetPrefs()->SetBoolean(kAlwaysShowBookmarkBarOnNTP, true);
 
-  // Check bookmark is visible on NTP.
+  // Check bookmark is visible on NTP after adding bookmark.
+  chrome::ToggleBookmarkBar(browser());
   EXPECT_EQ(BookmarkBar::SHOW, browser()->bookmark_bar_state());
-
-  // Check bookmark is still visible on NTP regardless of kBookmarkBar pref
-  // change.
   chrome::ToggleBookmarkBar(browser());
   EXPECT_EQ(BookmarkBar::SHOW, browser()->bookmark_bar_state());
+
+  // Turn off showing bookmark bar on NTP.
+  profile->GetPrefs()->SetBoolean(kAlwaysShowBookmarkBarOnNTP, false);
+
+  // Check bookmark bar on NTP is hidden.
+  EXPECT_EQ(BookmarkBar::HIDDEN, browser()->bookmark_bar_state());
+
+  // Check bookmark bar on NTP is visible when kBookmarkBar pref is on.
   chrome::ToggleBookmarkBar(browser());
   EXPECT_EQ(BookmarkBar::SHOW, browser()->bookmark_bar_state());
+
+  // Check bookmark bar on NTP is hidden when kBookmarkBar pref is off.
+  chrome::ToggleBookmarkBar(browser());
+  EXPECT_EQ(BookmarkBar::HIDDEN, browser()->bookmark_bar_state());
 }