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

chrome/browser/sync/sync_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/sync/sync_global_error.h"
 
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_observer.h"
 #include "chrome/browser/sync/sync_ui_util.h"
 #include "chrome/browser/ui/browser.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 "google_apis/gaia/google_service_auth_error.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"
 
 SyncGlobalError::SyncGlobalError(ProfileSyncService* service,
                                  SigninManagerBase* signin)
     : service_(service),
       signin_(signin) {
   DCHECK(service_);
   DCHECK(signin_);
   OnStateChanged();
 }
 
@@ skipping 20 matching lines @@
     return;
   }
   // Need to navigate to the settings page and display the UI.
   chrome::ShowSettingsSubPage(browser, chrome::kSyncSetupSubPage);
 }
 
 bool SyncGlobalError::HasBubbleView() {
   return !bubble_message_.empty() && !bubble_accept_label_.empty();
 }
 
+gfx::Image SyncGlobalError::GetBubbleViewIcon() {
+  return ResourceBundle::GetSharedInstance().GetNativeImageNamed(
+      IDR_INPUT_ALERT);
+}
+
 string16 SyncGlobalError::GetBubbleViewTitle() {
   return l10n_util::GetStringUTF16(IDS_SYNC_ERROR_BUBBLE_VIEW_TITLE);
 }
 
 std::vector<string16> SyncGlobalError::GetBubbleViewMessages() {
   return std::vector<string16>(1, bubble_message_);
 }
 
 string16 SyncGlobalError::GetBubbleViewAcceptButtonLabel() {
   return bubble_accept_label_;
@@ skipping 34 matching lines @@
     bubble_accept_label_ = bubble_accept_label;
 
     // Profile can be NULL during tests.
     Profile* profile = service_->profile();
     if (profile) {
       GlobalErrorServiceFactory::GetForProfile(
           profile)->NotifyErrorsChanged(this);
     }
   }
 }