mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Fix showing context menu in devtools

Browse source
This commit is contained in:
Cheng Zhao 2016-05-23 21:08:16 +09:00
parent c489d6d4b3
commit fca91db133
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
atom/browser/api/atom_api_menu_mac.mm
View file

@ -7,6 +7,8 @@
#include "atom/browser/native_window.h" #include "atom/browser/native_window.h"
#include "base/message_loop/message_loop.h" #include "base/message_loop/message_loop.h"
#include "base/strings/sys_string_conversions.h" #include "base/strings/sys_string_conversions.h"
#include "brightray/browser/inspectable_web_contents.h"
#include "brightray/browser/inspectable_web_contents_view.h"
#include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents.h"
#include "atom/common/node_includes.h" #include "atom/common/node_includes.h"
@ -22,14 +24,15 @@ void MenuMac::PopupAt(Window* window, int x, int y, int positioning_item) {
NativeWindow* native_window = window->window(); NativeWindow* native_window = window->window();
if (!native_window) if (!native_window)
return; return;
content::WebContents* web_contents = native_window->web_contents(); brightray::InspectableWebContents* web_contents =
native_window->inspectable_web_contents();
if (!web_contents) if (!web_contents)
return; return;
base::scoped_nsobject<AtomMenuController> menu_controller( base::scoped_nsobject<AtomMenuController> menu_controller(
[[AtomMenuController alloc] initWithModel:model_.get()]); [[AtomMenuController alloc] initWithModel:model_.get()]);
NSMenu* menu = [menu_controller menu]; NSMenu* menu = [menu_controller menu];
NSView* view = web_contents->GetContentNativeView(); NSView* view = web_contents->GetView()->GetNativeView();
// Which menu item to show. // Which menu item to show.
NSMenuItem* item = nil; NSMenuItem* item = nil;