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"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/search_engines/util.h"
 #import "chrome/browser/ui/browser.h"
 #import "chrome/browser/ui/browser_window.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/l10n_util.h"
 #import "chrome/browser/ui/cocoa/info_bubble_view.h"
 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
 #include "chrome/browser/ui/global_error/global_error.h"
 #include "chrome/browser/ui/global_error/global_error_bubble_view_base.h"
 #include "chrome/browser/ui/global_error/global_error_service.h"
 #include "chrome/browser/ui/global_error/global_error_service_factory.h"
 #include "grit/generated_resources.h"
 #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 
 namespace {
 
 // The vertical offset of the wrench bubble from the wrench menu button.
 const CGFloat kWrenchBubblePointOffsetY = 6;
 
 const CGFloat kParagraphSpacing = 6;
 
 } // namespace
@@ skipping 39 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_->GetBubbleViewIcon();
+  DCHECK(!image.IsEmpty());
+  [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];
 }