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

chrome/browser/signin/signin_global_error.cc

 // Copyright (c) 2013 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/signin/signin_global_error.h"
 
 #include "base/logging.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/signin/signin_manager.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/chrome_pages.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/webui/signin/login_ui_service.h"
 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"
 #include "chrome/common/url_constants.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
+#include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/image/image.h"
 
 SigninGlobalError::SigninGlobalError(SigninManagerBase* manager,
                                      Profile* profile)
     : auth_error_(GoogleServiceAuthError::AuthErrorNone()),
       signin_manager_(manager),
       profile_(profile) {
 }
 
 SigninGlobalError::~SigninGlobalError() {
   DCHECK(provider_set_.empty())
@@ skipping 85 matching lines @@
   }
   // Need to navigate to the settings page and display the UI.
   chrome::ShowSettingsSubPage(browser, chrome::kSyncSetupSubPage);
 #endif
 }
 
 bool SigninGlobalError::HasBubbleView() {
   return !GetBubbleViewMessages().empty();
 }
 
+gfx::Image SigninGlobalError::GetBubbleViewIcon() {
+  return ResourceBundle::GetSharedInstance().GetNativeImageNamed(
+      IDR_INPUT_ALERT);
+}
+
 string16 SigninGlobalError::GetBubbleViewTitle() {
   return l10n_util::GetStringUTF16(IDS_SIGNIN_ERROR_BUBBLE_VIEW_TITLE);
 }
 
 std::vector<string16> SigninGlobalError::GetBubbleViewMessages() {
   std::vector<string16> messages;
   // If the user isn't signed in, no need to display an error bubble.
   if (signin_manager_->GetAuthenticatedUsername().empty()) {
     return messages;
   }
@@ skipping 48 matching lines @@
 void SigninGlobalError::OnBubbleViewDidClose(Browser* browser) {
 }
 
 void SigninGlobalError::BubbleViewAcceptButtonPressed(Browser* browser) {
   ExecuteMenuItem(browser);
 }
 
 void SigninGlobalError::BubbleViewCancelButtonPressed(Browser* browser) {
   NOTREACHED();
 }