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..494bc9fb063f769f71e4258b1a4b40d95ae9f224 100644
--- a/chrome/browser/ui/views/global_error_bubble_view.cc
+++ b/chrome/browser/ui/views/global_error_bubble_view.cc
@@ -70,9 +70,13 @@ GlobalErrorBubbleView::GlobalErrorBubbleView(
       gfx::Insets(kAnchorVerticalInset, 0, kAnchorVerticalInset, 0));
 
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-  int resource_id = error_->GetBubbleViewIconResourceID();
+  gfx::Image* image = error_->GetBubbleViewCustomIcon();
+  if (!image) {
+    int resource_id = error_->GetBubbleViewIconResourceID();
+    image = &rb.GetNativeImageNamed(resource_id);
+  }
   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));