diff options
Diffstat (limited to 'chromium/content/browser/web_contents/web_contents_view_guest.h')
| -rw-r--r-- | chromium/content/browser/web_contents/web_contents_view_guest.h | 49 |
1 files changed, 20 insertions, 29 deletions
diff --git a/chromium/content/browser/web_contents/web_contents_view_guest.h b/chromium/content/browser/web_contents/web_contents_view_guest.h index 68fb473d709..53edd64e47f 100644 --- a/chromium/content/browser/web_contents/web_contents_view_guest.h +++ b/chromium/content/browser/web_contents/web_contents_view_guest.h @@ -8,10 +8,10 @@ #include <vector> #include "base/memory/scoped_ptr.h" +#include "content/browser/renderer_host/render_view_host_delegate_view.h" +#include "content/browser/web_contents/web_contents_view.h" #include "content/common/content_export.h" #include "content/common/drag_event_source_info.h" -#include "content/port/browser/render_view_host_delegate_view.h" -#include "content/port/browser/web_contents_view_port.h" namespace content { @@ -19,9 +19,8 @@ class WebContents; class WebContentsImpl; class BrowserPluginGuest; -class CONTENT_EXPORT WebContentsViewGuest - : public WebContentsViewPort, - public RenderViewHostDelegateView { +class WebContentsViewGuest : public WebContentsView, + public RenderViewHostDelegateView { public: // The corresponding WebContentsImpl is passed in the constructor, and manages // our lifetime. This doesn't need to be the case, but is this way currently @@ -30,7 +29,7 @@ class CONTENT_EXPORT WebContentsViewGuest // |platform_view|. WebContentsViewGuest(WebContentsImpl* web_contents, BrowserPluginGuest* guest, - scoped_ptr<WebContentsViewPort> platform_view, + scoped_ptr<WebContentsView> platform_view, RenderViewHostDelegateView* platform_view_delegate_view); virtual ~WebContentsViewGuest(); @@ -38,14 +37,16 @@ class CONTENT_EXPORT WebContentsViewGuest void OnGuestInitialized(WebContentsView* parent_view); - // WebContentsView implementation -------------------------------------------- + // Converts the guest specific coordinates in |params| to embedder specific + // ones. + ContextMenuParams ConvertContextMenuParams( + const ContextMenuParams& params) const; + // WebContentsView implementation -------------------------------------------- virtual gfx::NativeView GetNativeView() const OVERRIDE; virtual gfx::NativeView GetContentNativeView() const OVERRIDE; virtual gfx::NativeWindow GetTopLevelNativeWindow() const OVERRIDE; virtual void GetContainerBounds(gfx::Rect* out) const OVERRIDE; - virtual void OnTabCrashed(base::TerminationStatus status, - int error_code) OVERRIDE; virtual void SizeContents(const gfx::Size& size) OVERRIDE; virtual void Focus() OVERRIDE; virtual void SetInitialFocus() OVERRIDE; @@ -53,39 +54,29 @@ class CONTENT_EXPORT WebContentsViewGuest virtual void RestoreFocus() OVERRIDE; virtual DropData* GetDropData() const OVERRIDE; virtual gfx::Rect GetViewBounds() const OVERRIDE; -#if defined(OS_MACOSX) - virtual void SetAllowOverlappingViews(bool overlapping) OVERRIDE; - virtual bool GetAllowOverlappingViews() const OVERRIDE; - virtual void SetOverlayView(WebContentsView* overlay, - const gfx::Point& offset) OVERRIDE; - virtual void RemoveOverlayView() OVERRIDE; -#endif - - // WebContentsViewPort implementation ---------------------------------------- virtual void CreateView(const gfx::Size& initial_size, gfx::NativeView context) OVERRIDE; - virtual RenderWidgetHostView* CreateViewForWidget( + virtual RenderWidgetHostViewBase* CreateViewForWidget( RenderWidgetHost* render_widget_host) OVERRIDE; - virtual RenderWidgetHostView* CreateViewForPopupWidget( + virtual RenderWidgetHostViewBase* CreateViewForPopupWidget( RenderWidgetHost* render_widget_host) OVERRIDE; virtual void SetPageTitle(const base::string16& title) OVERRIDE; virtual void RenderViewCreated(RenderViewHost* host) OVERRIDE; virtual void RenderViewSwappedIn(RenderViewHost* host) OVERRIDE; virtual void SetOverscrollControllerEnabled(bool enabled) OVERRIDE; #if defined(OS_MACOSX) + virtual void SetAllowOverlappingViews(bool overlapping) OVERRIDE; + virtual bool GetAllowOverlappingViews() const OVERRIDE; + virtual void SetOverlayView(WebContentsView* overlay, + const gfx::Point& offset) OVERRIDE; + virtual void RemoveOverlayView() OVERRIDE; virtual bool IsEventTracking() const OVERRIDE; virtual void CloseTabAfterEventTracking() OVERRIDE; #endif // Backend implementation of RenderViewHostDelegateView. - virtual void ShowContextMenu(const ContextMenuParams& params) OVERRIDE; - virtual void ShowPopupMenu(const gfx::Rect& bounds, - int item_height, - double item_font_size, - int selected_item, - const std::vector<MenuItem>& items, - bool right_aligned, - bool allow_multiple_selection) OVERRIDE; + virtual void ShowContextMenu(RenderFrameHost* render_frame_host, + const ContextMenuParams& params) OVERRIDE; virtual void StartDragging(const DropData& drop_data, blink::WebDragOperationsMask allowed_ops, const gfx::ImageSkia& image, @@ -101,7 +92,7 @@ class CONTENT_EXPORT WebContentsViewGuest BrowserPluginGuest* guest_; // The platform dependent view backing this WebContentsView. // Calls to this WebContentsViewGuest are forwarded to |platform_view_|. - scoped_ptr<WebContentsViewPort> platform_view_; + scoped_ptr<WebContentsView> platform_view_; gfx::Size size_; // Delegate view for guest's platform view. |