chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.h - Issue 678653003: Remove Downcasting RVContextMenuBase in ContextMenuDeleagate implementations.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: 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

« no previous file with comments | « chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc ('k') | chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 977ab3d7bbf088307582349fbafc75984d363077..19d4a964afca363f9e25d85f3dcfedfeba2cb34e 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;

@@ -58,10 +57,10 @@ class ChromeWebContentsViewDelegateViews

void HideDisambiguationPopup() 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:

aura::Window* GetActiveNativeView();

@@ -74,7 +73,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_;