Make extensions in the extension shelf render their content to a visible GTK

chrome/browser/gtk/extension_shelf_gtk.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/gtk/extension_shelf_gtk.h"
 
 #include "chrome/browser/browser.h"
 #include "chrome/browser/gtk/browser_window_gtk.h"
 #include "chrome/browser/gtk/gtk_theme_provider.h"
 #include "chrome/browser/gtk/nine_box.h"
@@ skipping 10 matching lines @@
 
 class ExtensionShelfGtk::Toolstrip {
  public:
   explicit Toolstrip(ExtensionHost* host)
       : host_(host),
         extension_name_(host_->extension()->name()) {
     DCHECK(host_->view());
     Init();
   }
 
-  ~Toolstrip() {
-    label_.Destroy();
-  }
-
   void AddToolstripToBox(GtkWidget* box);
   void RemoveToolstripFromBox(GtkWidget* box);
 
  private:
   void Init();
 
+  gfx::NativeView native_view() {
+    return host_->view()->native_view();
+  }
+
   ExtensionHost* host_;
 
   const std::string extension_name_;
 
-  // Placeholder label with extension's name.
-  // TODO(phajdan.jr): replace the label with rendered extension contents.
-  OwnedWidgetGtk label_;
-
  private:
   DISALLOW_COPY_AND_ASSIGN(Toolstrip);
 };
 
 void ExtensionShelfGtk::Toolstrip::AddToolstripToBox(GtkWidget* box) {
-  gtk_box_pack_start(GTK_BOX(box), label_.get(), FALSE, FALSE,
+  gtk_box_pack_start(GTK_BOX(box), native_view(), TRUE, TRUE,
                      kToolstripPadding);
 }
 
 void ExtensionShelfGtk::Toolstrip::RemoveToolstripFromBox(GtkWidget* box) {
-  gtk_container_remove(GTK_CONTAINER(box), label_.get());
+  gtk_container_remove(GTK_CONTAINER(box), native_view());
 }
 
 void ExtensionShelfGtk::Toolstrip::Init() {
-  label_.Own(gtk_label_new(extension_name_.c_str()));
-  gtk_widget_show_all(label_.get());
+  host_->view()->set_is_toolstrip(true);
+  gtk_widget_show_all(native_view());
 }
 
 ExtensionShelfGtk::ExtensionShelfGtk(Profile* profile, Browser* browser)
     : browser_(browser),
       theme_provider_(GtkThemeProvider::GetFrom(profile)),
       model_(browser->extension_shelf_model()) {
   Init(profile);
 
   registrar_.Add(this, NotificationType::BROWSER_THEME_CHANGED,
                  NotificationService::AllSources());
@@ skipping 143 matching lines @@
                   event->area.width, event->area.height);
   cairo_clip(cr);
   bar->InitBackground();
   bar->background_ninebox_->RenderTopCenterStrip(
       cr, event->area.x, event->area.y,
       event->area.x + event->area.width);
   cairo_destroy(cr);
 
   return FALSE;  // Propagate expose to children.
 }