diff -r 6aeb7a756187 -r 3c88a81ff781 ginebra2/ToolbarChromeItem.h
--- a/ginebra2/ToolbarChromeItem.h	Thu Sep 23 15:32:11 2010 -0400
+++ b/ginebra2/ToolbarChromeItem.h	Fri Oct 15 17:30:59 2010 -0400
@@ -28,7 +28,7 @@
 
 namespace GVA {
 
-
+#ifndef  Q_WS_MAEMO_5
   class ToolbarChromeItem : public ChromeItem
   {
     Q_OBJECT
@@ -38,12 +38,18 @@
     virtual void paint(QPainter* painter, const QStyleOptionGraphicsItem* opt, QWidget* widget);
     virtual void setSnippet(ChromeSnippet* snippet);
     QPen pen() { return m_pen;}
+#ifdef BROWSER_LAYOUT_TENONE
+    void paintCornerBackgrounds(QPainter *painter);
+    void addCornerBackground();
+    void removeCornerBackground() { m_cornerBackgroundPixmap = QPixmap("");}
+#else
     QLinearGradient grad() { return m_grad;}
-    qreal opacity() { return m_opacity;}
-    void setOpacity(qreal opacity) {m_opacity = opacity;}
     QPainterPath* partialbg() { return m_partialbg;}
     void removePartialbg() { delete m_partialbg; m_partialbg = NULL;}
     void addPartialbg() ;
+#endif
+    qreal opacity() { return m_opacity;}
+    void setOpacity(qreal opacity) {m_opacity = opacity;}
 
   protected:
     virtual void resizeEvent(QGraphicsSceneResizeEvent * ev);
@@ -51,16 +57,50 @@
   private:
     void setProperties();
 
+#ifdef BROWSER_LAYOUT_TENONE
+    QPixmap m_cornerBackgroundPixmap;
+#else
     QPainterPath* m_partialbg;
+    QLinearGradient m_grad;
+#endif
+
     QPen m_pen;
-    QLinearGradient m_grad;
     qreal m_opacity;
     QColor m_borderColor;
     int m_padding;
     int m_borderWidth;
 
   };
+#else  
+  class ToolbarChromeItem : public ChromeItem
+  {
+    Q_OBJECT
+  public:
+    ToolbarChromeItem(ChromeSnippet* snippet, QGraphicsItem* parent = 0);
+    virtual ~ToolbarChromeItem();
+    virtual void paint(QPainter* painter, const QStyleOptionGraphicsItem* opt, QWidget* widget);
+    virtual void setSnippet(ChromeSnippet* snippet);
+    QPen pen() { return m_pen;}
+    qreal opacity() { return m_opacity;}
+    void setOpacity(qreal opacity) {m_opacity = opacity;}
+    void paintCornerBackgrounds(QPainter *painter);
+    void addCornerBackground();
 
+  protected:
+    virtual void resizeEvent(QGraphicsSceneResizeEvent * ev);
+
+  private:
+    void setProperties();
+
+    QPen m_pen;
+    QPixmap m_cornerBackgroundPixmap;
+    qreal m_opacity;
+    QColor m_borderColor;
+    int m_padding;
+    int m_borderWidth;
+
+  };
+#endif
 } // end of namespace GVA
 
 #endif // __GINEBRA_TOOLBARCHROMEITEM_H