diff options
-rw-r--r-- | lib/render_widget_host_view_qt.cpp | 2 | ||||
-rw-r--r-- | lib/render_widget_host_view_qt.h | 2 | ||||
-rw-r--r-- | lib/web_contents_view_qt.h | 48 |
3 files changed, 47 insertions, 5 deletions
diff --git a/lib/render_widget_host_view_qt.cpp b/lib/render_widget_host_view_qt.cpp index 266cddf4f..fe98b729f 100644 --- a/lib/render_widget_host_view_qt.cpp +++ b/lib/render_widget_host_view_qt.cpp @@ -16,8 +16,6 @@ #include <QWheelEvent> #include <QScreen> -#define QT_NOT_YET_IMPLEMENTED fprintf(stderr, "function %s not implemented! - %s:%d\n", __func__, __FILE__, __LINE__); - static void GetScreenInfoFromNativeWindow(QWindow* window, WebKit::WebScreenInfo* results) { QScreen* screen = window->screen(); diff --git a/lib/render_widget_host_view_qt.h b/lib/render_widget_host_view_qt.h index 44961d95b..a847669f0 100644 --- a/lib/render_widget_host_view_qt.h +++ b/lib/render_widget_host_view_qt.h @@ -3,6 +3,8 @@ #include "content/browser/renderer_host/render_widget_host_view_base.h" +#define QT_NOT_YET_IMPLEMENTED fprintf(stderr, "function %s not implemented! - %s:%d\n", __func__, __FILE__, __LINE__); + class QEvent; class QFocusEvent; class QKeyEvent; diff --git a/lib/web_contents_view_qt.h b/lib/web_contents_view_qt.h index 6eb1ccece..0d9786e7b 100644 --- a/lib/web_contents_view_qt.h +++ b/lib/web_contents_view_qt.h @@ -2,16 +2,18 @@ #define WEB_CONTENTS_VIEW_QT_ #include "content/browser/web_contents/web_contents_impl.h" -#include "content/browser/web_contents/web_contents_view_gtk.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 "render_widget_host_view_qt.h" -class WebContentsViewQt : public content::WebContentsViewGtk +class WebContentsViewQt + : public content::WebContentsViewPort + , public content::RenderViewHostDelegateView { public: WebContentsViewQt(content::WebContents* web_contents) - : content::WebContentsViewGtk(static_cast<content::WebContentsImpl*>(web_contents), 0) { } content::RenderWidgetHostView* CreateViewForWidget(content::RenderWidgetHost* render_widget_host) @@ -21,6 +23,46 @@ public: return view; } + + virtual void CreateView(const gfx::Size& initial_size, gfx::NativeView context) { QT_NOT_YET_IMPLEMENTED } + + virtual content::RenderWidgetHostView* CreateViewForPopupWidget(content::RenderWidgetHost* render_widget_host) { return 0; } + + virtual void SetPageTitle(const string16& title) { QT_NOT_YET_IMPLEMENTED } + + virtual void RenderViewCreated(content::RenderViewHost* host) { QT_NOT_YET_IMPLEMENTED } + + virtual void RenderViewSwappedIn(content::RenderViewHost* host) { QT_NOT_YET_IMPLEMENTED } + + virtual void SetOverscrollControllerEnabled(bool enabled) { QT_NOT_YET_IMPLEMENTED } + + virtual gfx::NativeView GetNativeView() const { QT_NOT_YET_IMPLEMENTED return 0; } + + virtual gfx::NativeView GetContentNativeView() const { QT_NOT_YET_IMPLEMENTED return 0; } + + virtual gfx::NativeWindow GetTopLevelNativeWindow() const { QT_NOT_YET_IMPLEMENTED return 0; } + + virtual void GetContainerBounds(gfx::Rect* out) const { QT_NOT_YET_IMPLEMENTED } + + virtual void OnTabCrashed(base::TerminationStatus status, int error_code) { QT_NOT_YET_IMPLEMENTED } + + virtual void SizeContents(const gfx::Size& size) { QT_NOT_YET_IMPLEMENTED } + + virtual void Focus() { QT_NOT_YET_IMPLEMENTED } + + virtual void SetInitialFocus() { QT_NOT_YET_IMPLEMENTED } + + virtual void StoreFocus() { QT_NOT_YET_IMPLEMENTED } + + virtual void RestoreFocus() { QT_NOT_YET_IMPLEMENTED } + + virtual WebDropData* GetDropData() const { QT_NOT_YET_IMPLEMENTED return 0; } + + virtual gfx::Rect GetViewBounds() const { QT_NOT_YET_IMPLEMENTED return gfx::Rect(); } + + virtual void ShowPopupMenu(const gfx::Rect& bounds, int item_height, double item_font_size, int selected_item, + const std::vector<WebMenuItem>& items, bool right_aligned, bool allow_multiple_selection) { QT_NOT_YET_IMPLEMENTED } + void setWindowContainer(void* c) { m_windowContainer = c; } void* windowContainer() { return m_windowContainer; } |