diff --git a/lib/qquickwebcontentsview.cpp b/lib/qquickwebcontentsview.cpp index 54ae779c6124767775869ea001bc783b6b9f2cd2..3e20e90f71bef0b2e6c1f326180c1973355e73e7 100644 --- a/lib/qquickwebcontentsview.cpp +++ b/lib/qquickwebcontentsview.cpp @@ -55,10 +55,6 @@ #include <QWidget> #include <QUrl> -namespace content { -QQuickWebContentsView* gQuickView = 0; -} - class QQuickWebContentsViewPrivate { public: @@ -69,10 +65,6 @@ QQuickWebContentsView::QQuickWebContentsView() { d.reset(new QQuickWebContentsViewPrivate); - // Cheap hack to allow getting signals from shell_qt.cpp. - Q_ASSERT(!content::gQuickView); - content::gQuickView = this; - content::BrowserContext* browser_context = static_cast<ContentBrowserClientQt*>(content::GetContentClient()->browser())->browser_context(); d->webContentsDelegate.reset(WebContentsDelegateQt::CreateNewWindow(browser_context, GURL(std::string("http://qt-project.org/")), NULL, MSG_ROUTING_NONE, gfx::Size(), this)); } diff --git a/lib/qquickwebcontentsview.h b/lib/qquickwebcontentsview.h index 030365c292a0b444497c13468991e28fc98bf24b..809bbf25e0702baacff7d11c1b1452d1d62bae23 100644 --- a/lib/qquickwebcontentsview.h +++ b/lib/qquickwebcontentsview.h @@ -45,10 +45,6 @@ #include <QQuickItem> #include <QScopedPointer> -namespace content { - class Shell; -} - class QQuickWebContentsViewPrivate; class Q_DECL_EXPORT QQuickWebContentsView : public QQuickItem { @@ -72,8 +68,6 @@ Q_SIGNALS: private: QScopedPointer<QQuickWebContentsViewPrivate> d; - - friend class content::Shell; }; QML_DECLARE_TYPE(QQuickWebContentsView) diff --git a/lib/qwebcontentsview.cpp b/lib/qwebcontentsview.cpp index c30973a481a19fd252a120fab352a3a4d968d685..2ce75f3a61cbbc8ff4d640b8405fca921f8fca67 100644 --- a/lib/qwebcontentsview.cpp +++ b/lib/qwebcontentsview.cpp @@ -55,10 +55,6 @@ #include <QWidget> #include <QUrl> -namespace content { -QWebContentsView* gWidgetView = 0; -} - class QWebContentsViewPrivate { public: @@ -69,9 +65,6 @@ QWebContentsView::QWebContentsView() { d.reset(new QWebContentsViewPrivate); - // Cheap hack to allow getting signals from shell_qt.cpp. - Q_ASSERT(!content::gWidgetView); - content::BrowserContext* browser_context = static_cast<ContentBrowserClientQt*>(content::GetContentClient()->browser())->browser_context(); d->webContentsDelegate.reset(WebContentsDelegateQt::CreateNewWindow(browser_context, GURL(std::string("http://qt-project.org/")), NULL, MSG_ROUTING_NONE, gfx::Size(), this)); } diff --git a/lib/qwebcontentsview.h b/lib/qwebcontentsview.h index 077c3cde6503bc03354a2169e42e6f47afb0a1da..e5f08231049084ff2cbcb97ad5da186c6c2893ef 100644 --- a/lib/qwebcontentsview.h +++ b/lib/qwebcontentsview.h @@ -45,10 +45,6 @@ #include <QWidget> #include <QScopedPointer> -namespace content { - class Shell; -} - class QWebContentsViewPrivate; class Q_DECL_EXPORT QWebContentsView : public QWidget { @@ -70,8 +66,6 @@ Q_SIGNALS: private: QScopedPointer<QWebContentsViewPrivate> d; - - friend class content::Shell; }; #endif // QWEBCONTESTSVIEW_H