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

chrome/browser/ui/global_error/global_error.cc

 // 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.
 
 #include "chrome/browser/ui/global_error/global_error.h"
 
 #include "base/logging.h"
 #include "chrome/browser/ui/global_error/global_error_bubble_view_base.h"
 #include "grit/theme_resources.h"
+#include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/image/image.h"
 
 GlobalError::GlobalError()
     : has_shown_bubble_view_(false),
       bubble_view_(NULL) {
 }
 
 GlobalError::~GlobalError() {
 }
 
 GlobalError::Severity GlobalError::GetSeverity() {
@@ skipping 18 matching lines @@
 #else
   bubble_view_ =
       GlobalErrorBubbleViewBase::ShowBubbleView(browser, AsWeakPtr());
 #endif
 }
 
 GlobalErrorBubbleViewBase* GlobalError::GetBubbleView() {
   return bubble_view_;
 }
 
-int GlobalError::GetBubbleViewIconResourceID() {
+gfx::Image GlobalError::GetBubbleViewIcon() {
   // If you change this make sure to also change the menu icon and the wrench
   // icon color.
-  return IDR_INPUT_ALERT;
+  return ResourceBundle::GetSharedInstance().GetNativeImageNamed(
+      IDR_INPUT_ALERT);
 }
 
 void GlobalError::BubbleViewDidClose(Browser* browser) {
   DCHECK(browser);
   bubble_view_ = NULL;
   OnBubbleViewDidClose(browser);
 }