From 8950caaa85f8d15bdec72716bcc83d5e0b3cb9ad Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@github.com>
Date: Tue, 11 Sep 2018 16:52:04 +0900
Subject: [PATCH] fix: read ignoreMenuShortcuts per WebContents (#14538)

---
 atom/browser/api/atom_api_web_contents.cc     |  4 +++-
 atom/browser/common_web_contents_delegate.h   |  5 -----
 .../common_web_contents_delegate_mac.mm       | 19 +++++++++++--------
 .../common_web_contents_delegate_views.cc     |  9 +++++++--
 4 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/atom/browser/api/atom_api_web_contents.cc b/atom/browser/api/atom_api_web_contents.cc
index 41aeee9fd60..2d38cd99224 100644
--- a/atom/browser/api/atom_api_web_contents.cc
+++ b/atom/browser/api/atom_api_web_contents.cc
@@ -1396,7 +1396,9 @@ void WebContents::UnregisterServiceWorker(
 }
 
 void WebContents::SetIgnoreMenuShortcuts(bool ignore) {
-  set_ignore_menu_shortcuts(ignore);
+  auto* web_preferences = WebContentsPreferences::From(web_contents());
+  DCHECK(web_preferences);
+  web_preferences->dict()->SetBoolean("ignoreMenuShortcuts", ignore);
 }
 
 void WebContents::SetAudioMuted(bool muted) {
diff --git a/atom/browser/common_web_contents_delegate.h b/atom/browser/common_web_contents_delegate.h
index 5da5d20975b..1000500ba76 100644
--- a/atom/browser/common_web_contents_delegate.h
+++ b/atom/browser/common_web_contents_delegate.h
@@ -62,10 +62,6 @@ class CommonWebContentsDelegate
 
   NativeWindow* owner_window() const { return owner_window_.get(); }
 
-  void set_ignore_menu_shortcuts(bool ignore) {
-    ignore_menu_shortcuts_ = ignore;
-  }
-
   bool is_html_fullscreen() const { return html_fullscreen_; }
 
  protected:
@@ -157,7 +153,6 @@ class CommonWebContentsDelegate
   base::WeakPtr<NativeWindow> owner_window_;
 
   bool offscreen_ = false;
-  bool ignore_menu_shortcuts_ = false;
 
   // Whether window is fullscreened by HTML5 api.
   bool html_fullscreen_ = false;
diff --git a/atom/browser/common_web_contents_delegate_mac.mm b/atom/browser/common_web_contents_delegate_mac.mm
index 2c75e944698..ed703d7efe5 100644
--- a/atom/browser/common_web_contents_delegate_mac.mm
+++ b/atom/browser/common_web_contents_delegate_mac.mm
@@ -6,6 +6,7 @@
 
 #import <Cocoa/Cocoa.h>
 
+#include "atom/browser/web_contents_preferences.h"
 #include "brightray/browser/mac/event_dispatching_window.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "ui/events/keycodes/keyboard_codes.h"
@@ -27,15 +28,17 @@ void CommonWebContentsDelegate::HandleKeyboardEvent(
   if (event.windows_key_code == ui::VKEY_ESCAPE && is_html_fullscreen())
     ExitFullscreenModeForTab(source);
 
-  if (!ignore_menu_shortcuts_) {
-    // Send the event to the menu before sending it to the window
-    if (event.os_event.type == NSKeyDown &&
-        [[NSApp mainMenu] performKeyEquivalent:event.os_event])
-      return;
+  if (auto* web_preferences = WebContentsPreferences::From(source)) {
+    if (!web_preferences->IsEnabled("ignoreMenuShortcuts", false)) {
+      // Send the event to the menu before sending it to the window
+      if (event.os_event.type == NSKeyDown &&
+          [[NSApp mainMenu] performKeyEquivalent:event.os_event])
+        return;
 
-    if (event.os_event.window &&
-        [event.os_event.window isKindOfClass:[EventDispatchingWindow class]])
-      [event.os_event.window redispatchKeyEvent:event.os_event];
+      if (event.os_event.window &&
+          [event.os_event.window isKindOfClass:[EventDispatchingWindow class]])
+        [event.os_event.window redispatchKeyEvent:event.os_event];
+    }
   }
 }
 
diff --git a/atom/browser/common_web_contents_delegate_views.cc b/atom/browser/common_web_contents_delegate_views.cc
index 0c7c6a6846d..12f937693a6 100644
--- a/atom/browser/common_web_contents_delegate_views.cc
+++ b/atom/browser/common_web_contents_delegate_views.cc
@@ -6,6 +6,7 @@
 
 #include "atom/browser/api/atom_api_web_contents_view.h"
 #include "atom/browser/native_window_views.h"
+#include "atom/browser/web_contents_preferences.h"
 #include "base/strings/string_util.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "ui/events/keycodes/keyboard_codes.h"
@@ -24,8 +25,12 @@ void CommonWebContentsDelegate::HandleKeyboardEvent(
     ExitFullscreenModeForTab(source);
 
   // Let the NativeWindow handle other parts.
-  if (!ignore_menu_shortcuts_ && owner_window())
-    owner_window()->HandleKeyboardEvent(source, event);
+  if (auto* web_preferences = WebContentsPreferences::From(source)) {
+    if (owner_window() &&
+        !web_preferences->IsEnabled("ignoreMenuShortcuts", false)) {
+      owner_window()->HandleKeyboardEvent(source, event);
+    }
+  }
 }
 
 void CommonWebContentsDelegate::ShowAutofillPopup(