diff -r bf4420e9fa4d -r 2e16851ffecd ginebra2/ChromeWidget.h
--- a/ginebra2/ChromeWidget.h	Fri Jun 11 16:23:26 2010 +0100
+++ b/ginebra2/ChromeWidget.h	Thu Jul 22 16:30:16 2010 +0100
@@ -1,21 +1,24 @@
 /*
 * Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License as published by
+* the Free Software Foundation, version 2.1 of the License.
 *
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License for more details.
 *
-* Contributors:
+* You should have received a copy of the GNU Lesser General Public License
+* along with this program.  If not,
+* see "http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html/".
 *
-* Description: 
+* Description:
 *
 */
 
-
 #ifndef __GINEBRA_CHROMEWIDGET_H__
 #define __GINEBRA_CHROMEWIDGET_H__
 
@@ -24,7 +27,6 @@
 #include <QtGui>
 //#include <QtScript>
 #include "wrtbrowsercontainer.h"
-#include "GreenChromeSnippet.h"
 #include "ViewController.h"
 
 class QWebPage;
@@ -32,13 +34,13 @@
 
 class MostVisitedPageStore;
 class ControllableViewBase;
-class QGraphicsSceneContextMenuEvent;
+
 using namespace WRT;
 
 namespace GVA {
 
-  class AppContentView;
   class ChromeSnippet;
+  class ChromeLayout;
   class ChromeDOM;
   class ChromeRenderer;
   class GinebraApplication;
@@ -49,29 +51,14 @@
   class ChromeWidgetJSObject;
   class LocaleDelegate;
   class DeviceDelegate;
+  class NetworkDelegate;
   class Downloads;
 
-  enum ChromeAnchor
-  {
-    anchorNone,
-    anchorCenter,
-    anchorTop,
-    anchorBottom,
-    anchorLeft,
-    anchorRight,
-    anchorTopLeft,
-    anchorTopRight,
-    anchorBottomLeft,
-    anchorBottomRight
-  };
-  
-  enum Aspect
-  {
-    portrait,
-    landscape
-  };
-
-  class ChromeWidget : public QGraphicsWidget
+  /*!
+   * \brief This class is responsible for maintaining the browser chrome and
+   * most of the other major components of the application.
+   */
+  class ChromeWidget : public QObject
   {
 
   Q_OBJECT
@@ -82,7 +69,10 @@
     void setChromeBaseDirectory(const QString dir);
     void setChromeFile(const QString file);
     void addView(ControllableViewBase * controllableView);
-    QGraphicsScene * getScene() { return m_scene; } //NB: change name to scene() !!
+
+    void addViewToLayout(ControllableViewBase * controllableView);
+    ChromeLayout * layout() { return m_layout; }
+    void setLayout(ChromeLayout * layout) { m_layout = layout; }
     ChromeRenderer * renderer() { return m_renderer; }
     ChromeDOM * dom() { return m_dom; }
     QRect getSnippetRect(const QString &docElementId);
@@ -91,92 +81,75 @@
     ControllableViewBase * getView(const QString& name);
     void showView(const QString &name);
     QWebPage * page() { return m_page; }
-    void anchorSnippet(ChromeSnippet * snippet);
     //NB: get rid of this (see comment in .cpp)!!!
     void adjustAnchorOffset(ChromeSnippet * snippet, qreal delta);
-    void anchorToView(ChromeSnippet* snippet, const QString & where = "top");
-    void detachFromView(ChromeSnippet* snippet, const QString & where = "top");
     void anchorTogether(ChromeSnippet* first, const QString &  secondId, qreal x = 0, qreal y = 0);
-    void unAnchor(ChromeSnippet* first);
-    //void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget* widget = 0);
     QGraphicsView *graphicsView() { return m_view; }
     void dump();
     QString getBaseDirectory() const { return m_baseDirectory; }
     ViewController * viewController() { return m_viewController; } // needed for UrlSearchSnippet
     QString currentView() {return m_viewController->currentView()->type() ;}
-  public slots: //NB: Many of these should not be exported to JS, so a separate a JS delegate would be better
-    int width(){return (int)size().width();}
-    void snippetShown(ChromeSnippet * snippet); 
-    void snippetHiding(ChromeSnippet * snippet);
+    void updateChromeLayout();
+    void sizeChange(QSize sz){ emit prepareForSizeChange(sz) ;}
+    void emitPopupShown(const QString &popupId);
+    void emitPopupHidden(const QString &popupId);
+
+  public slots:
     void loadStarted();
     void loadFinished(bool ok);
     void exportJSObjects();
     void exportJSObjectsToPage(QWebPage *page);
     void alert(const QString & msg);
-    qreal slideView(qreal delta);
     void onViewInstantiated(ControllableViewBase *view);
     void onCurrentViewChanged();
     void chromeInitialized();
     void reloadChrome();
     void loadUrlToCurrentPage(const QUrl & url);
     void pageCreated(WRT::WrtBrowserContainer * page);
-    
+    void onResize(QSizeF size);
+    void onAspectChanged(int aspect);
+
   signals:
     void internalChromeComplete();
     void chromeComplete();
     void aspectChanged(int aspect);
     void prepareForGeometryChange();
+    void prepareForSizeChange(QSize);
     //NB: This should be symbian ifdef'd but that would require symbian-specific chrome
     void symbianCarriageReturn();
+    void popupShown(const QString &id);
+    void popupHidden(const QString &id);
 
   public:
     Q_PROPERTY(QObjectList snippets READ getSnippets)
     QObjectList getSnippets();
-    /// \brief Returns either "portrait" or "landscape".
-    QString getDisplayMode() const;
-    Q_PROPERTY(QString displayMode READ getDisplayMode)
 
     QObject* getDisplaySize() const;
     Q_PROPERTY(QObject* displaySize READ getDisplaySize)
 
-  protected:
-    virtual void resizeEvent(QGraphicsSceneResizeEvent *ev);
-    virtual void contextMenuEvent(QGraphicsSceneContextMenuEvent* event);
-    //bool eventFilter(QObject *obj, QEvent *ev);
   private:
     void addSnippet( ChromeSnippet * snippet, const QString & docElementId);
     void getInitialSnippets();
     void clearChrome();
-    void addAnchors();
     void addJSObjectToWindow(QObject *object);
     void addJSObjectToPage(QObject *object, QWebPage *page);
     void updateMVGeometry();
-    void addViewToLayout(ControllableViewBase * controllableView);
     //void addJSObjectToEngine(QObject *object);
-    QGraphicsScene * m_scene;
-    QGraphicsView *m_view;
-    QGraphicsAnchorLayout *m_layout;
+    ChromeLayout * m_layout;
+    QGraphicsView *m_view; //TBD: not used?
     QString m_baseDirectory;
     QWebPage * m_page;
     ChromeRenderer * m_renderer;
     ChromeDOM * m_dom;
     Snippets * m_snippets;
     ViewController *m_viewController;
-    AppContentView * m_appView;
-    QList<QObject*> m_jsObjects;
+    //QList<QObject*> m_jsObjects;
     //QScriptEngine m_engine;
-    QGraphicsAnchorLayout *m_viewLayout;
-    SlidingWidget *m_viewPort;
-    QGraphicsWidget *m_topBar;
-    QGraphicsWidget *m_bottomBar;
-    QGraphicsWidget *m_leftBar;
-    QGraphicsWidget *m_rightBar;
-    //CollapsingWidget *m_viewBar;
     GinebraApplication *m_app;
-    Aspect m_aspect;
     ChromeWidgetJSObject *m_jsObject;
     LocaleDelegate *m_localeDelegate; // Owned
     DeviceDelegate *m_deviceDelegate;
+    NetworkDelegate *m_networkDelegate;
     Downloads * m_downloads; // Owned
   };