WIP: Edit existing sidebar item

fix brave/brave-browser#24964
brave · Aug 25, 2022 · 080586c · 080586c
1 parent fc45715
commit 080586c
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 0 deletions.
diff --git a/app/brave_generated_resources.grd b/app/brave_generated_resources.grd
@@ -647,6 +647,9 @@ Or change later at <ph name="SETTINGS_EXTENIONS_LINK">$2<ex>brave://settings/ext
 
       <!-- Sidebar -->
       <if expr="enable_sidebar">
+        <message name="IDS_SIDEBAR_ITEM_CONTEXT_MENU_EDIT" desc="Menu for editing an existing item from sidebar">
+          Edit
+        </message>
         <message name="IDS_SIDEBAR_ITEM_CONTEXT_MENU_REMOVE" desc="Menu for removing an item from sidebar">
           Remove
         </message>

diff --git a/browser/ui/sidebar/sidebar_model.cc b/browser/ui/sidebar/sidebar_model.cc
@@ -129,6 +129,10 @@ void SidebarModel::OnItemMoved(const SidebarItem& item, int from, int to) {
   UpdateActiveIndexAndNotify(new_active_index);
 }
 
+void SidebarModel::OnItemUpdated(const SidebarItem& item, int index) {
+  FetchFavicon(item);
+}
+
 void SidebarModel::OnWillRemoveItem(const SidebarItem& item, int index) {
   if (index == active_index_)
     UpdateActiveIndexAndNotify(-1);

diff --git a/browser/ui/sidebar/sidebar_model.h b/browser/ui/sidebar/sidebar_model.h
@@ -90,6 +90,7 @@ class SidebarModel : public SidebarService::Observer,
   // SidebarService::Observer overrides:
   void OnItemAdded(const SidebarItem& item, int index) override;
   void OnItemMoved(const SidebarItem& item, int from, int to) override;
+  void OnItemUpdated(const SidebarItem& item, int index) override;
   void OnWillRemoveItem(const SidebarItem& item, int index) override;
   void OnItemRemoved(const SidebarItem& item, int index) override;
 

diff --git a/browser/ui/views/sidebar/sidebar_items_contents_view.cc b/browser/ui/views/sidebar/sidebar_items_contents_view.cc
@@ -160,6 +160,11 @@ void SidebarItemsContentsView::ShowContextMenuForViewImpl(
   if (const ui::ColorProvider* color_provider = GetColorProvider()) {
     icon_color = color_provider->GetColor(kColorSidebarButtonBase);
   }
+  context_menu_model_->AddItemWithIcon(
+      kItemEdit,
+      brave_l10n::GetLocalizedResourceUTF16String(
+          IDS_SIDEBAR_ITEM_CONTEXT_MENU_EDIT),
+      ui::ImageModel::FromVectorIcon(kSidebarTrashIcon, icon_color));
   context_menu_model_->AddItemWithIcon(
       kItemRemove,
       brave_l10n::GetLocalizedResourceUTF16String(
@@ -185,6 +190,11 @@ void SidebarItemsContentsView::ExecuteCommand(int command_id, int event_flags) {
     GetSidebarService(browser_)->RemoveItemAt(index);
     return;
   }
+
+  if (command_id == kItemEdit) {
+    // TODO(simonhong): Launch edit dialog.
+    return;
+  }
 }
 
 void SidebarItemsContentsView::OnContextMenuClosed() {

diff --git a/browser/ui/views/sidebar/sidebar_items_contents_view.h b/browser/ui/views/sidebar/sidebar_items_contents_view.h
@@ -87,6 +87,7 @@ class SidebarItemsContentsView : public views::View,
   friend class sidebar::SidebarBrowserTest;
 
   enum ContextMenuIDs {
+    kItemEdit,
     kItemRemove,
   };
 

diff --git a/components/sidebar/sidebar_service.cc b/components/sidebar/sidebar_service.cc
@@ -276,6 +276,23 @@ void SidebarService::MoveItem(int from, int to) {
   UpdateSidebarItemsToPrefStore();
 }
 
+void SidebarService::UpdateItemAt(size_t index,
+                                  const GURL& url,
+                                  const std::u16string& title) {
+  DCHECK(items_.size() > index && index >= 0);
+  DCHECK_EQ(SidebarItem::Type::kTypeWeb, items_[index].type);
+  // Check |url| should be unique.
+
+  auto& item = items_[index];
+  item.url = url;
+  item.title = title;
+
+  for (Observer& obs : observers_)
+    obs.OnItemUpdated(item, index);
+
+  UpdateSidebarItemsToPrefStore();
+}
+
 void SidebarService::UpdateSidebarItemsToPrefStore() {
   // Store all items in a list pref.
   // Each item gets an entry. Built in items only need their type, and are

diff --git a/components/sidebar/sidebar_service.h b/components/sidebar/sidebar_service.h
@@ -39,6 +39,7 @@ class SidebarService : public KeyedService {
     virtual void OnItemMoved(const SidebarItem& item, int from, int to) {}
     virtual void OnWillRemoveItem(const SidebarItem& item, int index) {}
     virtual void OnItemRemoved(const SidebarItem& item, int index) {}
+    virtual void OnItemUpdated(const SidebarItem& item, int index) {}
     virtual void OnShowSidebarOptionChanged(ShowSidebarOption option) {}
 
    protected:
@@ -57,6 +58,9 @@ class SidebarService : public KeyedService {
   void RemoveItemAt(int index);
   void MoveItem(int from, int to);
 
+  // Only non-builtin type is editable.
+  void UpdateItemAt(size_t index, const GURL& url, const std::u16string& title);
+
   void AddObserver(Observer* observer);
   void RemoveObserver(Observer* observer);