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

chrome/browser/ui/cocoa/global_error_bubble_controller.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/global_error_bubble_controller.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_nsobject.h"
 #include "base/string_util.h"
 #include "base/strings/sys_string_conversions.h"
@@ skipping 65 matching lines @@
   [bubble showWindow:nil];
 
   return bubble->bridge_.get();
 }
 
 - (void)awakeFromNib {
   [super awakeFromNib];
 
   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();
   string16 message = JoinString(messages, '\n');
 
   scoped_nsobject<NSMutableAttributedString> messageValue(
       [[NSMutableAttributedString alloc]
         initWithString:SysUTF16ToNSString(message)]);
   scoped_nsobject<NSMutableParagraphStyle> style(
       [[NSMutableParagraphStyle alloc] init]);
@@ skipping 61 matching lines @@
   [self close];
 }
 
 @end
 
 GlobalErrorBubbleViewBase* GlobalErrorBubbleViewBase::ShowBubbleView(
     Browser* browser,
     const base::WeakPtr<GlobalError>& error) {
   return [GlobalErrorBubbleController showForBrowser:browser error:error];
 }