Add custom icon support to GlobalError. Show extension icon in permissions increase bubble.

chrome/browser/ui/gtk/global_error_bubble.cc

 // Copyright (c) 2012 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/ui/gtk/global_error_bubble.h"
 
 #include <gtk/gtk.h>
 
 #include "base/i18n/rtl.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/global_error/global_error.h"
 #include "chrome/browser/ui/global_error/global_error_service.h"
 #include "chrome/browser/ui/global_error/global_error_service_factory.h"
 #include "chrome/browser/ui/gtk/browser_toolbar_gtk.h"
 #include "chrome/browser/ui/gtk/browser_window_gtk.h"
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "ui/base/gtk/gtk_hig_constants.h"
-#include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/gtk_util.h"
 #include "ui/gfx/image/image.h"
 
 namespace {
 
 // Text size of the message label. 12.1px = 9pt @ 96dpi.
 const double kMessageTextSize = 12.1;
 
 // Minimum width of the message label.
 const int kMinMessageLabelWidth = 250;
@@ skipping 10 matching lines @@
   DCHECK(browser_);
   DCHECK(error_);
   GtkWidget* content = gtk_vbox_new(FALSE, ui::kControlSpacing);
   gtk_container_set_border_width(GTK_CONTAINER(content),
                                  ui::kContentAreaBorder);
   g_signal_connect(content, "destroy", G_CALLBACK(OnDestroyThunk), this);
 
   GtkThemeService* theme_service =
       GtkThemeService::GetFrom(browser_->profile());
 
-  int resource_id = error_->GetBubbleViewIconResourceID();
-  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-  GdkPixbuf* pixbuf = rb.GetNativeImageNamed(resource_id).ToGdkPixbuf();
+  gfx::Image image = error_->GetBubbleViewIcon();
+  CHECK(!image.IsEmpty());
+  GdkPixbuf* pixbuf = image.ToGdkPixbuf();
   GtkWidget* image_view = gtk_image_new_from_pixbuf(pixbuf);
 
   GtkWidget* title_label = theme_service->BuildLabel(
       UTF16ToUTF8(error_->GetBubbleViewTitle()),
       ui::kGdkBlack);
   std::vector<string16> messages = error_->GetBubbleViewMessages();
   for (size_t i = 0; i < messages.size(); ++i) {
     message_labels_.push_back(theme_service->BuildLabel(
         UTF16ToUTF8(messages[i]),
         ui::kGdkBlack));
@@ skipping 94 matching lines @@
     Browser* browser,
     const base::WeakPtr<GlobalError>& error) {
   BrowserWindowGtk* browser_window =
       BrowserWindowGtk::GetBrowserWindowForNativeWindow(
           browser->window()->GetNativeWindow());
   GtkWidget* anchor = browser_window->GetToolbar()->GetAppMenuButton();
 
   // The bubble will be automatically deleted when it's closed.
   return new GlobalErrorBubble(browser, error, anchor);
 }