diff options
Diffstat (limited to 'src/core/web_contents_view_qt.h')
| -rw-r--r-- | src/core/web_contents_view_qt.h | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/core/web_contents_view_qt.h b/src/core/web_contents_view_qt.h index a2059cd9b..0c20f2f18 100644 --- a/src/core/web_contents_view_qt.h +++ b/src/core/web_contents_view_qt.h @@ -42,11 +42,11 @@ #ifndef WEB_CONTENTS_VIEW_QT_H #define WEB_CONTENTS_VIEW_QT_H +#include "content/browser/renderer_host/render_view_host_delegate_view.h" #include "content/browser/web_contents/web_contents_impl.h" +#include "content/browser/web_contents/web_contents_view.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/render_widget_host.h" -#include "content/port/browser/render_view_host_delegate_view.h" -#include "content/port/browser/web_contents_view_port.h" #include "web_contents_adapter_client.h" #include "render_widget_host_view_qt.h" @@ -54,7 +54,7 @@ #include "web_engine_context.h" class WebContentsViewQt - : public content::WebContentsViewPort + : public content::WebContentsView , public content::RenderViewHostDelegateView { public: @@ -69,11 +69,11 @@ public: void initialize(WebContentsAdapterClient* client); WebContentsAdapterClient *client() { return m_client; } - virtual content::RenderWidgetHostView *CreateViewForWidget(content::RenderWidgetHost* render_widget_host) Q_DECL_OVERRIDE; + virtual content::RenderWidgetHostViewBase *CreateViewForWidget(content::RenderWidgetHost* render_widget_host) Q_DECL_OVERRIDE; virtual void CreateView(const gfx::Size& initial_size, gfx::NativeView context) Q_DECL_OVERRIDE; - virtual content::RenderWidgetHostView* CreateViewForPopupWidget(content::RenderWidgetHost* render_widget_host) Q_DECL_OVERRIDE; + virtual content::RenderWidgetHostViewBase* CreateViewForPopupWidget(content::RenderWidgetHost* render_widget_host) Q_DECL_OVERRIDE; virtual void SetPageTitle(const base::string16& title) Q_DECL_OVERRIDE { } @@ -91,8 +91,6 @@ public: virtual void GetContainerBounds(gfx::Rect* out) const Q_DECL_OVERRIDE; - virtual void OnTabCrashed(base::TerminationStatus status, int error_code) Q_DECL_OVERRIDE { QT_NOT_YET_IMPLEMENTED } - virtual void SizeContents(const gfx::Size& size) Q_DECL_OVERRIDE { QT_NOT_YET_IMPLEMENTED } virtual void Focus() Q_DECL_OVERRIDE; @@ -112,7 +110,7 @@ public: virtual void StartDragging(const content::DropData& drop_data, blink::WebDragOperationsMask allowed_ops, const gfx::ImageSkia& image, const gfx::Vector2d& image_offset, const content::DragEventSourceInfo& event_info) Q_DECL_OVERRIDE; - virtual void ShowContextMenu(const content::ContextMenuParams ¶ms) Q_DECL_OVERRIDE; + virtual void ShowContextMenu(content::RenderFrameHost *, const content::ContextMenuParams ¶ms) Q_DECL_OVERRIDE; virtual void TakeFocus(bool reverse) Q_DECL_OVERRIDE; |