add force paste option to context menu

brave · Apr 26, 2022 · 8497a60 · 8497a60
1 parent cb752c3
commit 8497a60
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 0 deletions.
diff --git a/app/brave_command_ids.h b/app/brave_command_ids.h
@@ -48,6 +48,7 @@
 #define IDC_APP_MENU_IPFS_SHARE_LOCAL_FOLDER 56036
 #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_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
@@ -514,6 +514,9 @@ Or change later at <ph name="SETTINGS_EXTENIONS_LINK">$2<ex>brave://settings/ext
       <message name="IDS_LOCATION_BAR_ONION_AVAILABLE_TOOLTIP_TEXT" desc="The tooltip text for onion available button.">
         Open using .onion address
       </message>
+      <message name="IDS_CONTENT_CONTEXT_FORCE_PASTE" desc="The name of the context menu item to paste without triggering onpaste handleres">
+        Force Paste
+      </message>
       <message name="IDS_CONTENT_CONTEXT_IMPORT_IPFS" desc="The name of the IPFS context menu item for renderer">
         Import to IPFS
       </message>

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
@@ -156,6 +156,11 @@ BraveRenderViewContextMenu::BraveRenderViewContextMenu(
 
 bool BraveRenderViewContextMenu::IsCommandIdEnabled(int id) const {
   switch (id) {
+    case IDC_CONTENT_CONTEXT_FORCE_PASTE:
+      // only enable if there is plain text data to paste - this is what
+      // IsPasteAndMatchStyleEnabled checks internally, but IsPasteEnabled
+      // allows non text types
+      return IsPasteAndMatchStyleEnabled();
 #if BUILDFLAG(ENABLE_IPFS)
     case IDC_CONTENT_CONTEXT_IMPORT_IPFS:
     case IDC_CONTENT_CONTEXT_IMPORT_IPFS_PAGE:
@@ -218,6 +223,14 @@ void BraveRenderViewContextMenu::ExecuteIPFSCommand(int id, int event_flags) {
 
 void BraveRenderViewContextMenu::ExecuteCommand(int id, int event_flags) {
   switch (id) {
+    case IDC_CONTENT_CONTEXT_FORCE_PASTE: {
+      std::u16string result;
+      ui::Clipboard::GetForCurrentThread()->ReadText(
+          ui::ClipboardBuffer::kCopyPaste,
+          CreateDataEndpoint(/*notify_if_restricted=*/true).get(), &result);
+      // Replace works just like Paste, but it doesn't trigger onpaste handlers
+      source_web_contents_->Replace(result);
+    }; break;
 #if BUILDFLAG(ENABLE_IPFS)
     case IDC_CONTENT_CONTEXT_IMPORT_IPFS_PAGE:
     case IDC_CONTENT_CONTEXT_IMPORT_IMAGE_IPFS:
@@ -356,7 +369,18 @@ void BraveRenderViewContextMenu::InitMenu() {
   RenderViewContextMenu_Chromium::InitMenu();
 
   int index = -1;
+
+  index = menu_model_.GetIndexOfCommandId(
+      IDC_CONTENT_CONTEXT_PASTE_AND_MATCH_STYLE);
+  if (index != -1) {
+    menu_model_.InsertItemWithStringIdAt(
+          index + 1,
+          IDC_CONTENT_CONTEXT_FORCE_PASTE,
+          IDS_CONTENT_CONTEXT_FORCE_PASTE);
+  }
+
 #if BUILDFLAG(ENABLE_TOR)
+  index = -1;
   // Add Open Link with Tor
   if (!TorProfileServiceFactory::IsTorDisabled() &&
       !params_.link_url.is_empty()) {