Disabled not working sidebar items in guest window

fix brave/brave-browser#34162
brave · Nov 10, 2023 · ba72cbe · ba72cbe
1 parent 233fc8b
commit ba72cbe
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 5 deletions.
diff --git a/browser/ui/sidebar/sidebar_browsertest.cc b/browser/ui/sidebar/sidebar_browsertest.cc
@@ -664,6 +664,25 @@ IN_PROC_BROWSER_TEST_F(SidebarBrowserTest, UnManagedPanelEntryTest) {
   EXPECT_EQ(SidePanelEntryId::kBookmarks, panel_ui->GetCurrentEntryId());
 }
 
+IN_PROC_BROWSER_TEST_F(SidebarBrowserTest, DisabledItemsTestWithGuestWindow) {
+  auto* guest_browser = static_cast<BraveBrowser*>(CreateGuestBrowser());
+  auto* controller = guest_browser->sidebar_controller();
+  auto* model = controller->model();
+  auto sidebar_items_contents_view = GetSidebarItemsContentsView(controller);
+  for (const auto& item : model->GetAllSidebarItems()) {
+    auto index = model->GetIndexOf(item);
+    ASSERT_TRUE(index.has_value());
+    auto* item_view = sidebar_items_contents_view->children()[*index];
+    ASSERT_TRUE(item_view);
+    if (IsBuiltInType(item) &&
+        SidebarService::IsDisabledItemForGuest(item.built_in_item_type)) {
+      EXPECT_FALSE(item_view->GetEnabled());
+    } else {
+      EXPECT_TRUE(item_view->GetEnabled());
+    }
+  }
+}
+
 class SidebarBrowserTestWithPlaylist : public SidebarBrowserTest {
  public:
   SidebarBrowserTestWithPlaylist() {

diff --git a/browser/ui/sidebar/sidebar_service_factory.cc b/browser/ui/sidebar/sidebar_service_factory.cc
@@ -33,8 +33,8 @@ SidebarServiceFactory::~SidebarServiceFactory() = default;
 
 KeyedService* SidebarServiceFactory::BuildServiceInstanceFor(
     content::BrowserContext* context) const {
-  auto* prefs = Profile::FromBrowserContext(context)->GetPrefs();
-  return new SidebarService(prefs);
+  auto* profile = Profile::FromBrowserContext(context);
+  return new SidebarService(profile->GetPrefs(), profile->IsGuestSession());
 }
 
 content::BrowserContext* SidebarServiceFactory::GetBrowserContextToUse(

diff --git a/browser/ui/views/sidebar/sidebar_items_contents_view.cc b/browser/ui/views/sidebar/sidebar_items_contents_view.cc
@@ -534,6 +534,10 @@ void SidebarItemsContentsView::UpdateItemViewStateAt(size_t index,
         item_view->SetEnabled(false);
       }
     }
+
+    if (item.disabled && item_view->GetEnabled()) {
+      item_view->SetEnabled(false);
+    }
   }
 }
 

diff --git a/components/sidebar/sidebar_item.h b/components/sidebar/sidebar_item.h
@@ -57,6 +57,7 @@ struct SidebarItem {
   std::u16string title;
   // Set false to open this item in new tab.
   bool open_in_panel = false;
+  bool disabled = false;
 };
 
 bool IsBuiltInType(const SidebarItem& item);

diff --git a/components/sidebar/sidebar_service.cc b/components/sidebar/sidebar_service.cc
@@ -124,6 +124,20 @@ bool SidebarItemUpdate::operator==(const SidebarItemUpdate& update) const {
          url_updated == update.url_updated;
 }
 
+// static
+bool SidebarService::IsDisabledItemForGuest(SidebarItem::BuiltInItemType type) {
+  switch (type) {
+    case SidebarItem::BuiltInItemType::kBookmarks:
+    case SidebarItem::BuiltInItemType::kReadingList:
+    case SidebarItem::BuiltInItemType::kChatUI:
+    case SidebarItem::BuiltInItemType::kPlaylist:
+      return true;
+    default:
+      return false;
+  }
+  NOTREACHED_NORETURN();
+}
+
 // static
 void SidebarService::RegisterProfilePrefs(PrefRegistrySimple* registry,
                                           version_info::Channel channel) {
@@ -138,8 +152,8 @@ void SidebarService::RegisterProfilePrefs(PrefRegistrySimple* registry,
   registry->RegisterIntegerPref(kSidePanelWidth, kDefaultSidePanelWidth);
 }
 
-SidebarService::SidebarService(PrefService* prefs)
-    : prefs_(prefs), sidebar_p3a_(prefs) {
+SidebarService::SidebarService(PrefService* prefs, bool is_guest)
+    : prefs_(prefs), sidebar_p3a_(prefs), is_guest_(is_guest) {
   DCHECK(prefs_);
   MigratePrefSidebarBuiltInItemsToHidden();
 
@@ -613,6 +627,7 @@ std::vector<SidebarItem> SidebarService::GetDefaultSidebarItems() const {
   for (const auto& item_type : SidebarService::kDefaultBuiltInItemTypes) {
     if (auto item = GetBuiltInItemForType(item_type);
         item.built_in_item_type != SidebarItem::BuiltInItemType::kNone) {
+      item.disabled = (is_guest_ && IsDisabledItemForGuest(item_type));
       items.push_back(std::move(item));
     }
   }

diff --git a/components/sidebar/sidebar_service.h b/components/sidebar/sidebar_service.h
@@ -77,7 +77,7 @@ class SidebarService : public KeyedService {
   static void RegisterProfilePrefs(PrefRegistrySimple* registry,
                                    version_info::Channel channel);
 
-  explicit SidebarService(PrefService* prefs);
+  explicit SidebarService(PrefService* prefs, bool is_guest = false);
   ~SidebarService() override;
 
   const std::vector<SidebarItem>& items() const { return items_; }
@@ -110,6 +110,10 @@ class SidebarService : public KeyedService {
   FRIEND_TEST_ALL_PREFIXES(SidebarServiceTest, AddRemoveItems);
   FRIEND_TEST_ALL_PREFIXES(SidebarBrowserTest, ItemAddedBubbleAnchorViewTest);
   FRIEND_TEST_ALL_PREFIXES(SidebarBrowserTest, ItemAddedScrollTest);
+  FRIEND_TEST_ALL_PREFIXES(SidebarBrowserTest,
+                           DisabledItemsTestWithGuestWindow);
+
+  static bool IsDisabledItemForGuest(SidebarItem::BuiltInItemType type);
 
   void LoadSidebarItems();
   void UpdateSidebarItemsToPrefStore();
@@ -129,6 +133,7 @@ class SidebarService : public KeyedService {
 
   p3a::SidebarP3A sidebar_p3a_;
 
+  bool is_guest_ = false;
   base::ObserverList<Observer> observers_;
   PrefChangeRegistrar pref_change_registrar_;
 };
-Original file line number
+Diff line change
@@ Expand Up @@
             item_view->SetEnabled(false);
           }
         }
+        if (item.disabled && item_view->GetEnabled()) {
+          item_view->SetEnabled(false);
+        }
       }
     }
@@ Expand Down @@