Remove Downcasting RVContextMenuBase in ContextMenuDeleagate implementations.

athena/content/web_contents_view_delegate_factory_impl.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 "athena/content/public/web_contents_view_delegate_creator.h"
 
 #include "athena/content/render_view_context_menu_impl.h"
 #include "components/web_modal/popup_manager.h"
 #include "components/web_modal/single_web_contents_dialog_manager.h"
 #include "components/web_modal/web_contents_modal_dialog_host.h"
@@ skipping 63 matching lines @@
     if (focused_frame) {
       menu.reset(new RenderViewContextMenuImpl(focused_frame, params));
       menu->Init();
     }
     return menu.Pass();
   }
 
   void ShowMenu(scoped_ptr<RenderViewContextMenuImpl> menu) {
     context_menu_.reset(menu.release());
 
-    if (!context_menu_.get())
+    if (!context_menu_)
       return;
 
-    // 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;
-
-    const content::ContextMenuParams& params = context_menu_->params();
-    // Don't show empty menus.
-    if (context_menu_->menu_model().GetItemCount() == 0)
-      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);
-    }
-    // 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());
-    context_menu_->RunMenuAt(
-        top_level_widget, screen_point, params.source_type);
+    context_menu_->Show();
   }
 
   aura::Window* GetActiveNativeView() {
     return web_contents_->GetFullscreenRenderWidgetHostView()
                ? web_contents_->GetFullscreenRenderWidgetHostView()
                      ->GetNativeView()
                : web_contents_->GetNativeView();
   }
 
   views::Widget* GetTopLevelWidget() {
@@ skipping 19 matching lines @@
 };
 
 }  // namespace
 
 content::WebContentsViewDelegate* CreateWebContentsViewDelegate(
     content::WebContents* web_contents) {
   return new WebContentsViewDelegateImpl(web_contents);
 }
 
 }  // namespace athena