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

Unified Diff: chrome/browser/ui/cocoa/tab_contents/chrome_web_contents_view_delegate_mac.h

Issue 678653003: Remove Downcasting RVContextMenuBase in ContextMenuDeleagate implementations. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove virtual keyword when override is specified Created 6 years, 2 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: chrome/browser/ui/cocoa/tab_contents/chrome_web_contents_view_delegate_mac.h
diff --git a/chrome/browser/ui/cocoa/tab_contents/chrome_web_contents_view_delegate_mac.h b/chrome/browser/ui/cocoa/tab_contents/chrome_web_contents_view_delegate_mac.h
index 0611acc90ae25e75a040d07b8f226051fcf61050..eec3c0b775fe2e21497b0a1c10a8a1835ae11902 100644
--- a/chrome/browser/ui/cocoa/tab_contents/chrome_web_contents_view_delegate_mac.h
+++ b/chrome/browser/ui/cocoa/tab_contents/chrome_web_contents_view_delegate_mac.h
@@ -12,8 +12,7 @@
#include "components/renderer_context_menu/context_menu_delegate.h"
#include "content/public/browser/web_contents_view_delegate.h"
-class RenderViewContextMenu;
-class RenderViewContextMenuMac;
+class RenderViewContextMenuBase;
class WebDragBookmarkHandlerMac;
namespace content {
@@ -38,16 +37,16 @@ class ChromeWebContentsViewDelegateMac
const content::ContextMenuParams& params) override;
// Overridden from ContextMenuDelegate.
- scoped_ptr<RenderViewContextMenu> BuildMenu(
+ scoped_ptr<RenderViewContextMenuBase> BuildMenu(
content::WebContents* web_contents,
const content::ContextMenuParams& params) override;
- void ShowMenu(scoped_ptr<RenderViewContextMenu> menu) override;
+ void ShowMenu(scoped_ptr<RenderViewContextMenuBase> menu) override;
private:
content::RenderWidgetHostView* GetActiveRenderWidgetHostView();
// The context menu. Callbacks are asynchronous so we need to keep it around.
- scoped_ptr<RenderViewContextMenuMac> context_menu_;
+ scoped_ptr<RenderViewContextMenuBase> context_menu_;
// The chrome specific delegate that receives events from WebDragDestMac.
scoped_ptr<WebDragBookmarkHandlerMac> bookmark_handler_;

Powered by Google App Engine
This is Rietveld 408576698