| 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_;
|
|
|