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

Unified Diff: chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.h

Issue 678653003: Remove Downcasting RVContextMenuBase in ContextMenuDeleagate implementations. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: sync @toot 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/views/tab_contents/chrome_web_contents_view_delegate_views.h
diff --git a/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.h b/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.h
index 899956edfe26c18cf27a73c737a41580de6483f5..1dfdb34b9b1aab408f4ac35a546c57e4777a9103 100644
--- a/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.h
+++ b/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.h
@@ -12,8 +12,7 @@
#include "content/public/browser/web_contents_view_delegate.h"
class LinkDisambiguationPopup;
-class RenderViewContextMenu;
-class RenderViewContextMenuViews;
+class RenderViewContextMenuBase;
namespace aura {
class Window;
@@ -59,10 +58,10 @@ class ChromeWebContentsViewDelegateViews
virtual void HideDisambiguationPopup() override;
// Overridden from ContextMenuDelegate.
- virtual scoped_ptr<RenderViewContextMenu> BuildMenu(
+ virtual scoped_ptr<RenderViewContextMenuBase> BuildMenu(
content::WebContents* web_contents,
const content::ContextMenuParams& params) override;
- virtual void ShowMenu(scoped_ptr<RenderViewContextMenu> menu) override;
+ virtual void ShowMenu(scoped_ptr<RenderViewContextMenuBase> menu) override;
private:
aura::Window* GetActiveNativeView();
@@ -75,7 +74,7 @@ class ChromeWebContentsViewDelegateViews
// The context menu is reset every time we show it, but we keep a pointer to
// between uses so that it won't go out of scope before we're done with it.
- scoped_ptr<RenderViewContextMenuViews> context_menu_;
+ scoped_ptr<RenderViewContextMenuBase> context_menu_;
// The chrome specific delegate that receives events from WebDragDest.
scoped_ptr<content::WebDragDestDelegate> bookmark_handler_;

Powered by Google App Engine
This is Rietveld 408576698