Fixing the Position of Context Menu for BrowserPlugin (<webview>)

chrome/browser/guest_view/web_view/chrome_web_view_guest_delegate.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 
 #include "chrome/browser/guest_view/web_view/chrome_web_view_guest_delegate.h"
 
 #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h"
 #include "chrome/browser/favicon/favicon_utils.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 21 matching lines @@
 
 ChromeWebViewGuestDelegate::~ChromeWebViewGuestDelegate() {
 }
 
 bool ChromeWebViewGuestDelegate::HandleContextMenu(
     const content::ContextMenuParams& params) {
   ContextMenuDelegate* menu_delegate =
       ContextMenuDelegate::FromWebContents(guest_web_contents());
   DCHECK(menu_delegate);
 
-  pending_menu_ = menu_delegate->BuildMenu(guest_web_contents(), params);
+  content::ContextMenuParams new_params = params;
+  // The only case where |context_menu_position_| is not initialized is the case
+  // where the input event is directly sent to the guest WebContents without
+  // ever going throught the embedder and BrowserPlugin's
+  // RenderWidgetHostViewGuest. This only happens in some tests, e.g.,
+  // WebViewInteractiveTest.ContextMenuParamCoordinates.
+  if (context_menu_position_) {
+    new_params.x = context_menu_position_->x();
+    new_params.y = context_menu_position_->y();
+  }
+
+  pending_menu_ = menu_delegate->BuildMenu(guest_web_contents(), new_params);
   // It's possible for the returned menu to be null, so early out to avoid
   // a crash. TODO(wjmaclean): find out why it's possible for this to happen
   // in the first place, and if it's an error.
   if (!pending_menu_)
     return false;
 
   // Pass it to embedder.
   int request_id = ++pending_context_menu_request_id_;
   scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue());
   scoped_ptr<base::ListValue> items =
@@ skipping 79 matching lines @@
   } else if (details.notification_type ==
       chromeos::ACCESSIBILITY_TOGGLE_SPOKEN_FEEDBACK) {
     if (details.enabled)
       InjectChromeVoxIfNeeded(guest_web_contents()->GetRenderViewHost());
     else
       chromevox_injected_ = false;
   }
 }
 #endif
 
+void ChromeWebViewGuestDelegate::SetContextMenuPosition(
+    const gfx::Point& position) {
+  if (context_menu_position_ == nullptr)
+    context_menu_position_.reset(new gfx::Point());
+
+  *context_menu_position_ = position;
+}
+
 }  // namespace extensions