mac rebase fix

bendspoons · Oct 9, 2015 · c81c882 · c81c882
1 parent be0d62a
commit c81c882
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/patch/patches/webrtc_openssl.patch b/patch/patches/webrtc_openssl.patch
@@ -1,7 +1,7 @@
-diff --git a/base/base.gyp b/base/base.gyp
+diff --git base/base.gyp base/base.gyp
 index 7bfa3e3..4685b0b 100644
---- a/base/base.gyp
-+++ b/base/base.gyp
+--- base/base.gyp
++++ base/base.gyp
 @@ -548,7 +548,7 @@
                'conditions': [
                  # On some platforms, the rest of NSS is bundled. On others,

diff --git a/src/api/menu/menu_mac.mm b/src/api/menu/menu_mac.mm
@@ -26,7 +26,7 @@
 #import <Cocoa/Cocoa.h>
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/render_widget_host_view.h"
-#include "content/public/browser/render_view_host.h"
+#include "content/public/browser/render_frame_host.h"
 #include "content/nw/src/api/object_manager.h"
 #include "content/nw/src/api/menu/menu_delegate_mac.h"
 #include "content/nw/src/api/menuitem/menuitem.h"
@@ -57,10 +57,9 @@
   [menu_ removeItem:menu_item->menu_item_];
 }
 
-void Menu::Popup(int x, int y, content::RenderViewHost* rvh) {
+void Menu::Popup(int x, int y, content::RenderFrameHost* rfh) {
   // Fake out a context menu event for our menu
-  NSView* web_view =
-        rvh->GetView()->GetNativeView();
+  NSView* web_view = rfh->GetNativeView();
   NSWindow* window = [web_view window];
   NSEvent* currentEvent = [NSApp currentEvent];
   NSPoint position = { x, web_view.bounds.size.height - y };