| Index: chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc
|
| diff --git a/chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc b/chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc
|
| index c841763ce6da1666ae40fe96a4afcf175997b921..27d715c1fbf909e500626aa8e75058289034dc59 100644
|
| --- a/chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc
|
| +++ b/chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc
|
| @@ -10,10 +10,14 @@
|
| #include "chrome/grit/generated_resources.h"
|
| #include "components/renderer_context_menu/views/toolkit_delegate_views.h"
|
| #include "content/public/browser/render_view_host.h"
|
| +#include "content/public/browser/render_widget_host_view.h"
|
| #include "content/public/browser/web_contents.h"
|
| +#include "ui/aura/client/screen_position_client.h"
|
| +#include "ui/aura/window.h"
|
| #include "ui/base/accelerators/accelerator.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
| #include "ui/events/keycodes/keyboard_codes.h"
|
| +#include "ui/views/widget/widget.h"
|
|
|
| using content::WebContents;
|
|
|
| @@ -49,6 +53,25 @@ void RenderViewContextMenuViews::RunMenuAt(views::Widget* parent,
|
| ////////////////////////////////////////////////////////////////////////////////
|
| // RenderViewContextMenuViews, protected:
|
|
|
| +void RenderViewContextMenuViews::CalculateScreenCoordinatesInParams() {
|
| + views::Widget* top_level_widget = GetTopLevelWidget();
|
| + if (!top_level_widget)
|
| + return;
|
| +
|
| + gfx::Point screen_point(params().x, params().y);
|
| +
|
| + // Convert from target window coordinates to root window coordinates.
|
| + aura::Window* target_window = GetActiveNativeView();
|
| + aura::Window* root_window = target_window->GetRootWindow();
|
| + aura::client::ScreenPositionClient* screen_position_client =
|
| + aura::client::GetScreenPositionClient(root_window);
|
| + if (screen_position_client)
|
| + screen_position_client->ConvertPointToScreen(target_window, &screen_point);
|
| +
|
| + params_.screen_x = screen_point.x();
|
| + params_.screen_y = screen_point.y();
|
| +}
|
| +
|
| bool RenderViewContextMenuViews::GetAcceleratorForCommandId(
|
| int command_id,
|
| ui::Accelerator* accel) {
|
| @@ -167,3 +190,40 @@ void RenderViewContextMenuViews::AppendPlatformEditableItems() {
|
| l10n_util::GetStringUTF16(IDS_CONTENT_CONTEXT_WRITING_DIRECTION_MENU),
|
| &bidi_submenu_model_);
|
| }
|
| +
|
| +void RenderViewContextMenuViews::Show() {
|
| + // Menus need a Widget to work. If we're not the active tab we won't
|
| + // necessarily be in a widget.
|
| + views::Widget* top_level_widget = GetTopLevelWidget();
|
| + if (!top_level_widget)
|
| + return;
|
| +
|
| + // Don't show empty menus.
|
| + if (menu_model().GetItemCount() == 0)
|
| + return;
|
| +
|
| + // Enable recursive tasks on the message loop so we can get updates while
|
| + // the context menu is being displayed.
|
| + base::MessageLoop::ScopedNestableTaskAllower allow(
|
| + base::MessageLoop::current());
|
| + RunMenuAt(top_level_widget,
|
| + gfx::Point(params().screen_x, params().screen_y),
|
| + params().source_type);
|
| +}
|
| +
|
| +views::Widget* RenderViewContextMenuViews::GetTopLevelWidget() {
|
| + return views::Widget::GetTopLevelWidgetForNativeView(GetActiveNativeView());
|
| +}
|
| +
|
| +aura::Window* RenderViewContextMenuViews::GetActiveNativeView() {
|
| + WebContents* web_contents =
|
| + WebContents::FromRenderFrameHost(GetRenderFrameHost());
|
| + if (!web_contents) {
|
| + LOG(ERROR) << "RenderViewContextMenuViews::Show, couldn't find WebContents";
|
| + return NULL;
|
| + }
|
| + return web_contents->GetFullscreenRenderWidgetHostView()
|
| + ? web_contents->GetFullscreenRenderWidgetHostView()
|
| + ->GetNativeView()
|
| + : web_contents->GetNativeView();
|
| +}
|
|
|