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

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

Issue 1133003003: Fix copying from interstitial pages on OSX by going through the RenderWidgetHostDelegate. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address Nasko's comments. Created 5 years, 7 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
« no previous file with comments | « content/browser/renderer_host/render_widget_host_impl.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/render_widget_host_view_mac.mm
diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
index ccb1ecfe7b477cbb8c26063724def0a10130e70c..2d249ab929219daca5d71fbc6e80153fb54d294e 100644
--- a/content/browser/renderer_host/render_widget_host_view_mac.mm
+++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
@@ -38,6 +38,7 @@
#include "content/browser/gpu/compositor_util.h"
#include "content/browser/renderer_host/render_view_host_impl.h"
#include "content/browser/renderer_host/render_widget_helper.h"
+#include "content/browser/renderer_host/render_widget_host_delegate.h"
#import "content/browser/renderer_host/render_widget_host_view_mac_dictionary_helper.h"
#import "content/browser/renderer_host/render_widget_host_view_mac_editcommand_helper.h"
#import "content/browser/renderer_host/text_input_client_mac.h"
@@ -3256,45 +3257,66 @@ extern NSString *NSTextInputReplacementRangeAttributeName;
}
- (void)undo:(id)sender {
- WebContents* web_contents = renderWidgetHostView_->GetWebContents();
- if (web_contents)
- web_contents->Undo();
+ content::RenderWidgetHostDelegate* render_widget_host_delegate =
+ renderWidgetHostView_->render_widget_host_->GetDelegate();
+ if (!render_widget_host_delegate) {
Charlie Reis 2015/05/14 20:36:28 nit: Seems like this would be easier to read, like
+ return;
+ }
+ render_widget_host_delegate->Undo();
}
- (void)redo:(id)sender {
- WebContents* web_contents = renderWidgetHostView_->GetWebContents();
- if (web_contents)
- web_contents->Redo();
+ content::RenderWidgetHostDelegate* render_widget_host_delegate =
+ renderWidgetHostView_->render_widget_host_->GetDelegate();
+ if (!render_widget_host_delegate) {
+ return;
+ }
+ render_widget_host_delegate->Redo();
}
- (void)cut:(id)sender {
- WebContents* web_contents = renderWidgetHostView_->GetWebContents();
- if (web_contents)
- web_contents->Cut();
+ content::RenderWidgetHostDelegate* render_widget_host_delegate =
+ renderWidgetHostView_->render_widget_host_->GetDelegate();
+ if (!render_widget_host_delegate) {
+ return;
+ }
+ render_widget_host_delegate->Cut();
}
- (void)copy:(id)sender {
- WebContents* web_contents = renderWidgetHostView_->GetWebContents();
- if (web_contents)
- web_contents->Copy();
+ content::RenderWidgetHostDelegate* render_widget_host_delegate =
+ renderWidgetHostView_->render_widget_host_->GetDelegate();
+ if (!render_widget_host_delegate) {
+ return;
+ }
+ render_widget_host_delegate->Copy();
}
- (void)copyToFindPboard:(id)sender {
- WebContents* web_contents = renderWidgetHostView_->GetWebContents();
- if (web_contents)
- web_contents->CopyToFindPboard();
+ content::RenderWidgetHostDelegate* render_widget_host_delegate =
+ renderWidgetHostView_->render_widget_host_->GetDelegate();
+ if (!render_widget_host_delegate) {
+ return;
+ }
+ render_widget_host_delegate->CopyToFindPboard();
}
- (void)paste:(id)sender {
- WebContents* web_contents = renderWidgetHostView_->GetWebContents();
- if (web_contents)
- web_contents->Paste();
+ content::RenderWidgetHostDelegate* render_widget_host_delegate =
+ renderWidgetHostView_->render_widget_host_->GetDelegate();
+ if (!render_widget_host_delegate) {
+ return;
+ }
+ render_widget_host_delegate->Paste();
}
- (void)pasteAndMatchStyle:(id)sender {
- WebContents* web_contents = renderWidgetHostView_->GetWebContents();
- if (web_contents)
- web_contents->PasteAndMatchStyle();
+ content::RenderWidgetHostDelegate* render_widget_host_delegate =
+ renderWidgetHostView_->render_widget_host_->GetDelegate();
+ if (!render_widget_host_delegate) {
+ return;
+ }
+ render_widget_host_delegate->PasteAndMatchStyle();
}
- (void)selectAll:(id)sender {
@@ -3305,9 +3327,12 @@ extern NSString *NSTextInputReplacementRangeAttributeName;
// menu handler, neither is true.
// Explicitly call SelectAll() here to make sure the renderer returns
// selection results.
- WebContents* web_contents = renderWidgetHostView_->GetWebContents();
- if (web_contents)
- web_contents->SelectAll();
+ content::RenderWidgetHostDelegate* render_widget_host_delegate =
+ renderWidgetHostView_->render_widget_host_->GetDelegate();
+ if (!render_widget_host_delegate) {
+ return;
+ }
+ render_widget_host_delegate->SelectAll();
}
- (void)startSpeaking:(id)sender {
« no previous file with comments | « content/browser/renderer_host/render_widget_host_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698