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

chrome/browser/extensions/extension_warning_badge_service.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/extensions/extension_warning_badge_service.h"
 
 #include "base/stl_util.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/ui/global_error/global_error.h"
 #include "chrome/browser/ui/global_error/global_error_service.h"
 #include "chrome/browser/ui/global_error/global_error_service_factory.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/gfx/image/image.h"
 
 namespace extensions {
 
 namespace {
 // Non-modal GlobalError implementation that warns the user if extensions
 // created warnings or errors. If the user clicks on the wrench menu, the user
 // is redirected to chrome://extensions to inspect the errors.
 class ErrorBadge : public GlobalError {
  public:
   explicit ErrorBadge(ExtensionWarningBadgeService* badge_service);
   virtual ~ErrorBadge();
 
   // Implementation for GlobalError:
   virtual bool HasMenuItem() OVERRIDE;
   virtual int MenuItemCommandID() OVERRIDE;
   virtual string16 MenuItemLabel() OVERRIDE;
   virtual void ExecuteMenuItem(Browser* browser) OVERRIDE;
 
   virtual bool HasBubbleView() OVERRIDE;
+  virtual gfx::Image GetBubbleViewIcon() OVERRIDE;
   virtual string16 GetBubbleViewTitle() OVERRIDE;
   virtual std::vector<string16> GetBubbleViewMessages() OVERRIDE;
   virtual string16 GetBubbleViewAcceptButtonLabel() OVERRIDE;
   virtual string16 GetBubbleViewCancelButtonLabel() OVERRIDE;
   virtual void OnBubbleViewDidClose(Browser* browser) OVERRIDE;
   virtual void BubbleViewAcceptButtonPressed(Browser* browser) OVERRIDE;
   virtual void BubbleViewCancelButtonPressed(Browser* browser) OVERRIDE;
 
   static int GetMenuItemCommandID();
 
@@ skipping 25 matching lines @@
   // a badge on the wrench menu in the future of this session.
   badge_service_->SuppressCurrentWarnings();
 
   chrome::ExecuteCommand(browser, IDC_MANAGE_EXTENSIONS);
 }
 
 bool ErrorBadge::HasBubbleView() {
   return false;
 }
 
+gfx::Image ErrorBadge::GetBubbleViewIcon() {
+  return gfx::Image();
+}
+
 string16 ErrorBadge::GetBubbleViewTitle() {
   return string16();
 }
 
 std::vector<string16> ErrorBadge::GetBubbleViewMessages() {
   return std::vector<string16>();
 }
 
 string16 ErrorBadge::GetBubbleViewAcceptButtonLabel() {
   return string16();
@@ skipping 72 matching lines @@
   // Activate or hide the warning badge in case the current state is incorrect.
   if (error && !show) {
     service->RemoveGlobalError(error);
     delete error;
   } else if (!error && show) {
     service->AddGlobalError(new ErrorBadge(this));
   }
 }
 
 }  // extensions