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

chrome/browser/ui/cocoa/global_error_bubble_controller.mm

Index: chrome/browser/ui/cocoa/global_error_bubble_controller.mm
diff --git a/chrome/browser/ui/cocoa/global_error_bubble_controller.mm b/chrome/browser/ui/cocoa/global_error_bubble_controller.mm
index 778881706ddd9816659a8d7e8285e169127d76ae..3a6e9b18c3cc625064e430163245a49beb9a5233 100644
--- a/chrome/browser/ui/cocoa/global_error_bubble_controller.mm
+++ b/chrome/browser/ui/cocoa/global_error_bubble_controller.mm
@@ -83,9 +83,13 @@ class Bridge : public GlobalErrorBubbleViewBase {
 
   DCHECK(error_);
 
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-  [iconView_ setImage:rb.GetNativeImageNamed(
-      error_->GetBubbleViewIconResourceID()).ToNSImage()];
+  gfx::Image* image = error_->GetBubbleViewCustomIcon();
+  if (!image) {
+    int resource_id = error_->GetBubbleViewIconResourceID();
+    ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+    image = &rb.GetNativeImageNamed(resource_id);
+  }
+  [iconView_ setImage:image->ToNSImage()];
 
   [title_ setStringValue:SysUTF16ToNSString(error_->GetBubbleViewTitle())];
   std::vector<string16> messages = error_->GetBubbleViewMessages();