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

chrome/browser/ui/views/global_error_bubble_view.cc

Index: chrome/browser/ui/views/global_error_bubble_view.cc
diff --git a/chrome/browser/ui/views/global_error_bubble_view.cc b/chrome/browser/ui/views/global_error_bubble_view.cc
index 7046776c56a9c5e0ff8b363159c40d8b38696d34..e74bd213f7d090fb1401f57b062288afea9e9178 100644
--- a/chrome/browser/ui/views/global_error_bubble_view.cc
+++ b/chrome/browser/ui/views/global_error_bubble_view.cc
@@ -70,9 +70,10 @@ GlobalErrorBubbleView::GlobalErrorBubbleView(
       gfx::Insets(kAnchorVerticalInset, 0, kAnchorVerticalInset, 0));
 
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-  int resource_id = error_->GetBubbleViewIconResourceID();
+  gfx::Image image = error_->GetBubbleViewIcon();
+  CHECK(!image.IsEmpty());
   scoped_ptr<views::ImageView> image_view(new views::ImageView());
-  image_view->SetImage(rb.GetImageNamed(resource_id).ToImageSkia());
+  image_view->SetImage(image.ToImageSkia());
 
   string16 title_string(error_->GetBubbleViewTitle());
   scoped_ptr<views::Label> title_label(new views::Label(title_string));