Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1483)

Unified Diff: content/browser/renderer_host/render_widget_host_view_mac.mm

Issue 183923030: Almost finish moving context_menu_node_ from RenderViewImpl to RenderFrameImpl. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/render_widget_host_view_mac.mm
===================================================================
--- content/browser/renderer_host/render_widget_host_view_mac.mm (revision 254898)
+++ content/browser/renderer_host/render_widget_host_view_mac.mm (working copy)
@@ -27,6 +27,7 @@
#include "base/sys_info.h"
#import "content/browser/accessibility/browser_accessibility_cocoa.h"
#include "content/browser/accessibility/browser_accessibility_manager_mac.h"
+#include "content/browser/frame_host/render_frame_host_impl.h"
nasko 2014/03/05 21:50:47 nit: Why include the impl when using only the publ
jam 2014/03/06 00:59:37 that's the recommended style for includes inside c
#include "content/browser/renderer_host/backing_store_mac.h"
#include "content/browser/renderer_host/backing_store_manager.h"
#include "content/browser/renderer_host/compositing_iosurface_context_mac.h"
@@ -73,6 +74,7 @@
using content::BrowserAccessibilityManager;
using content::EditCommand;
using content::NativeWebKeyboardEvent;
+using content::RenderFrameHost;
using content::RenderViewHostImpl;
using content::RenderWidgetHostImpl;
using content::RenderWidgetHostViewMac;
@@ -3968,15 +3970,19 @@
- (void)cut:(id)sender {
if (renderWidgetHostView_->render_widget_host_->IsRenderView()) {
- static_cast<RenderViewHostImpl*>(
- renderWidgetHostView_->render_widget_host_)->Cut();
+ RenderFrameHost* frame = static_cast<RenderViewHostImpl*>(
+ renderWidgetHostView_->render_widget_host_)->GetFocusedFrame();
+ if (frame)
+ frame->Cut();
}
}
- (void)copy:(id)sender {
if (renderWidgetHostView_->render_widget_host_->IsRenderView()) {
- static_cast<RenderViewHostImpl*>(
- renderWidgetHostView_->render_widget_host_)->Copy();
+ RenderFrameHost* frame = static_cast<RenderViewHostImpl*>(
+ renderWidgetHostView_->render_widget_host_)->GetFocusedFrame();
+ if (frame)
+ frame->Copy();
}
}
@@ -3989,8 +3995,10 @@
- (void)paste:(id)sender {
if (renderWidgetHostView_->render_widget_host_->IsRenderView()) {
- static_cast<RenderViewHostImpl*>(
- renderWidgetHostView_->render_widget_host_)->Paste();
+ RenderFrameHost* frame = static_cast<RenderViewHostImpl*>(
+ renderWidgetHostView_->render_widget_host_)->GetFocusedFrame();
+ if (frame)
+ frame->Paste();
}
}

Powered by Google App Engine
This is Rietveld 408576698