Cleanup unneeded global variables.

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));
 }

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)

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));
 }

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