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

chrome/browser/ui/global_error/global_error.cc

Index: chrome/browser/ui/global_error/global_error.cc
diff --git a/chrome/browser/ui/global_error/global_error.cc b/chrome/browser/ui/global_error/global_error.cc
index fce33ef384749b15f8e30ab461166dca579d443e..d6fdd6d13794d615b4d336ec8f4eb788f9b0bf4c 100644
--- a/chrome/browser/ui/global_error/global_error.cc
+++ b/chrome/browser/ui/global_error/global_error.cc
@@ -7,6 +7,8 @@
 #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),
@@ -45,10 +47,11 @@ 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) {