Added Copy Clean URL item

brave · Jul 19, 2022 · 42b61a3 · 42b61a3
1 parent a89df68
commit 42b61a3
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 1 deletion.
diff --git a/app/brave_command_ids.h b/app/brave_command_ids.h
@@ -48,6 +48,7 @@
 #define IDC_APP_MENU_IPFS_OPEN_FILES 56037
 #define IDC_APP_MENU_IPFS_UPDATE_IPNS 56038
 #define IDC_CONTENT_CONTEXT_FORCE_PASTE 56039
+#define IDC_CONTENT_CONTEXT_COPYCLEANLINKLOCATION 56040
 
 #define IDC_CONTENT_CONTEXT_IMPORT_IPNS_KEYS_START 56100
 #define IDC_CONTENT_CONTEXT_IMPORT_IPNS_KEYS_END 56199

diff --git a/app/brave_generated_resources.grd b/app/brave_generated_resources.grd
@@ -908,7 +908,9 @@ Or change later at <ph name="SETTINGS_EXTENIONS_LINK">$2<ex>brave://settings/ext
       <message name="IDS_IMPORTED_FROM_BOOKMARK_FOLDER" desc="Name for bookmark panel folder imported from another browser">
         Imported from <ph name="BROWSER_NAME">$1<ex>Chrome</ex></ph>.
       </message>
-
+      <message name="IDS_CONTENT_CONTEXT_COPYCLEANLINKLOCATION" desc="The name of the context menu item to copy clean address location">
+        Copy clean link address
+      </message>
       <!--Add new items to the appropriate sections above -->
     </messages>
   </release>

diff --git a/chromium_src/chrome/browser/renderer_context_menu/render_view_context_menu.cc b/chromium_src/chrome/browser/renderer_context_menu/render_view_context_menu.cc
@@ -161,6 +161,8 @@ bool BraveRenderViewContextMenu::IsCommandIdEnabled(int id) const {
       // IsPasteAndMatchStyleEnabled checks internally, but IsPasteEnabled
       // allows non text types
       return IsPasteAndMatchStyleEnabled();
+    case IDC_CONTENT_CONTEXT_COPYCLEANLINKLOCATION:
+      return params_.unfiltered_link_url.is_valid();
 #if BUILDFLAG(ENABLE_IPFS)
     case IDC_CONTENT_CONTEXT_IMPORT_IPFS:
     case IDC_CONTENT_CONTEXT_IMPORT_IPFS_PAGE:
@@ -221,8 +223,18 @@ void BraveRenderViewContextMenu::ExecuteIPFSCommand(int id, int event_flags) {
 }
 #endif
 
+void BraveRenderViewContextMenu::WriteCleanURLToClipboard(const GURL& url) {
+  GURL::Replacements replacements;
+  replacements.SetPathStr(url.path_piece());
+  WriteURLToClipboard(url.GetWithEmptyPath().ReplaceComponents(replacements));
+}
+
 void BraveRenderViewContextMenu::ExecuteCommand(int id, int event_flags) {
   switch (id) {
+    case IDC_CONTENT_CONTEXT_COPYCLEANLINKLOCATION:
+      WriteCleanURLToClipboard(params_.unfiltered_link_url);
+      break;
+
     case IDC_CONTENT_CONTEXT_FORCE_PASTE: {
       std::u16string result;
       ui::Clipboard::GetForCurrentThread()->ReadText(
@@ -370,6 +382,16 @@ void BraveRenderViewContextMenu::BuildIPFSMenu() {
 }
 #endif
 
+void BraveRenderViewContextMenu::AddCleanCopyLinkItem() {
+  int index =
+      menu_model_.GetIndexOfCommandId(IDC_CONTENT_CONTEXT_COPYLINKLOCATION);
+  if (index != -1) {
+    menu_model_.InsertItemWithStringIdAt(
+        index + 1, IDC_CONTENT_CONTEXT_COPYCLEANLINKLOCATION,
+        IDS_CONTENT_CONTEXT_COPYCLEANLINKLOCATION);
+  }
+}
+
 void BraveRenderViewContextMenu::InitMenu() {
   RenderViewContextMenu_Chromium::InitMenu();
 
@@ -405,6 +427,7 @@ void BraveRenderViewContextMenu::InitMenu() {
 #if BUILDFLAG(ENABLE_IPFS)
   BuildIPFSMenu();
 #endif
+  AddCleanCopyLinkItem();
 
 #if BUILDFLAG(ENABLE_BRAVE_TRANSLATE_GO)
   const bool remove_translate =

diff --git a/chromium_src/chrome/browser/renderer_context_menu/render_view_context_menu.h b/chromium_src/chrome/browser/renderer_context_menu/render_view_context_menu.h
@@ -41,6 +41,8 @@ class BraveRenderViewContextMenu : public RenderViewContextMenu_Chromium {
   static void AddSpellCheckServiceItem(ui::SimpleMenuModel* menu,
                                        bool is_checked);
   void AddAccessibilityLabelsServiceItem(bool is_checked) override;
+  void AddCleanCopyLinkItem();
+  void WriteCleanURLToClipboard(const GURL& url);
 
  private:
   // RenderViewContextMenuBase: