diff options
Diffstat (limited to 'chrome/browser/tab_contents/render_view_context_menu_gtk.cc')
| -rw-r--r-- | chrome/browser/tab_contents/render_view_context_menu_gtk.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/chrome/browser/tab_contents/render_view_context_menu_gtk.cc b/chrome/browser/tab_contents/render_view_context_menu_gtk.cc index 763ca25..bdc5b5c 100644 --- a/chrome/browser/tab_contents/render_view_context_menu_gtk.cc +++ b/chrome/browser/tab_contents/render_view_context_menu_gtk.cc @@ -10,7 +10,7 @@ #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/ui/gtk/gtk_util.h" -#include "content/browser/renderer_host/render_widget_host_view_gtk.h" +#include "content/browser/renderer_host/render_widget_host_view.h" #include "content/public/browser/web_contents.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" @@ -76,9 +76,10 @@ GtkWidget* GetMenuItemByID(ui::MenuModel* model, RenderViewContextMenuGtk::RenderViewContextMenuGtk( WebContents* web_contents, const ContextMenuParams& params, - guint32 triggering_event_time) - : RenderViewContextMenu(web_contents, params), - triggering_event_time_(triggering_event_time) { + RenderWidgetHostView* view) + : RenderViewContextMenu(web_contents, params) { + GdkEventButton* event = view->GetLastMouseDown(); + triggering_event_time_ = event ? event->time : GDK_CURRENT_TIME; } RenderViewContextMenuGtk::~RenderViewContextMenuGtk() { @@ -88,8 +89,8 @@ void RenderViewContextMenuGtk::PlatformInit() { menu_gtk_.reset(new MenuGtk(this, &menu_model_)); if (params_.is_editable) { - RenderWidgetHostViewGtk* rwhv = static_cast<RenderWidgetHostViewGtk*>( - source_web_contents_->GetRenderWidgetHostView()); + RenderWidgetHostView* rwhv = + source_web_contents_->GetRenderWidgetHostView(); #if !defined(TOOLKIT_VIEWS) if (rwhv) { MenuGtk* menu = menu_gtk_.get(); |