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

Unified Diff: content/browser/tab_contents/web_drag_dest_gtk.cc

Issue 9473001: Extract minimal RenderViewHost interface for embedders, leaving (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to LKGR. Created 8 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/tab_contents/web_drag_dest_gtk.cc
diff --git a/content/browser/tab_contents/web_drag_dest_gtk.cc b/content/browser/tab_contents/web_drag_dest_gtk.cc
index 1a66354f0aaefffebdfef48f06a61902eb90cb93..deac93cfc394ca1aac4af0c32c4a94dd22470714 100644
--- a/content/browser/tab_contents/web_drag_dest_gtk.cc
+++ b/content/browser/tab_contents/web_drag_dest_gtk.cc
@@ -68,7 +68,7 @@ void WebDragDestGtk::UpdateDragStatus(WebDragOperation operation) {
}
void WebDragDestGtk::DragLeave() {
- web_contents_->GetRenderViewHost()->DragTargetDragLeave();
+ GetRenderViewHost()->DragTargetDragLeave();
if (delegate())
delegate()->OnDragLeave();
@@ -115,11 +115,10 @@ gboolean WebDragDestGtk::OnDragMotion(GtkWidget* sender,
time);
}
} else if (data_requests_ == 0) {
- web_contents_->GetRenderViewHost()->
- DragTargetDragOver(
- ui::ClientPoint(widget_),
- ui::ScreenPoint(widget_),
- content::GdkDragActionToWebDragOp(context->actions));
+ GetRenderViewHost()->DragTargetDragOver(
+ ui::ClientPoint(widget_),
+ ui::ScreenPoint(widget_),
+ content::GdkDragActionToWebDragOp(context->actions));
if (delegate())
delegate()->OnDragOver();
@@ -221,11 +220,11 @@ void WebDragDestGtk::OnDragDataReceived(
if (data_requests_ == 0) {
// Tell the renderer about the drag.
// |x| and |y| are seemingly arbitrary at this point.
- web_contents_->GetRenderViewHost()->
- DragTargetDragEnter(*drop_data_.get(),
- ui::ClientPoint(widget_),
- ui::ScreenPoint(widget_),
- content::GdkDragActionToWebDragOp(context->actions));
+ GetRenderViewHost()->DragTargetDragEnter(
+ *drop_data_.get(),
+ ui::ClientPoint(widget_),
+ ui::ScreenPoint(widget_),
+ content::GdkDragActionToWebDragOp(context->actions));
if (delegate())
delegate()->OnDragEnter();
@@ -255,7 +254,7 @@ gboolean WebDragDestGtk::OnDragDrop(GtkWidget* sender, GdkDragContext* context,
// Cancel that drag leave!
method_factory_.InvalidateWeakPtrs();
- web_contents_->GetRenderViewHost()->
+ GetRenderViewHost()->
DragTargetDrop(ui::ClientPoint(widget_), ui::ScreenPoint(widget_));
if (delegate())
@@ -269,4 +268,8 @@ gboolean WebDragDestGtk::OnDragDrop(GtkWidget* sender, GdkDragContext* context,
return TRUE;
}
+RenderViewHostImpl* WebDragDestGtk::GetRenderViewHost() const {
+ return static_cast<RenderViewHostImpl*>(web_contents_->GetRenderViewHost());
+}
+
} // namespace content
« no previous file with comments | « content/browser/tab_contents/web_drag_dest_gtk.h ('k') | content/browser/tab_contents/web_drag_source_gtk.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698