[InfoBar] Add InfoBarDelegate::GetIconID()

chrome/browser/ui/extensions/app_metro_infobar_delegate_win.cc

 // Copyright 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/ui/extensions/app_metro_infobar_delegate_win.h"
 
 #include "apps/app_launch_for_metro_restart_win.h"
 #include "base/bind_helpers.h"
 #include "base/message_loop.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/app_list/app_list_service_win.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/metro_chrome_win.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/url_constants.h"
 #include "grit/generated_resources.h"
 #include "grit/google_chrome_strings.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/resource/resource_bundle.h"
 #include "win8/util/win8_util.h"
 
 namespace chrome {
 
 // static
 void AppMetroInfoBarDelegateWin::Create(
     Profile* profile, Mode mode, const std::string& extension_id) {
   DCHECK(win8::IsSingleWindowMetroMode());
   DCHECK_EQ(mode == SHOW_APP_LIST, extension_id.empty());
 
@@ skipping 26 matching lines @@
     Mode mode,
     const std::string& extension_id)
     : ConfirmInfoBarDelegate(info_bar_service),
       mode_(mode),
       extension_id_(extension_id) {
   DCHECK_EQ(mode_ == SHOW_APP_LIST, extension_id_.empty());
 }
 
 AppMetroInfoBarDelegateWin::~AppMetroInfoBarDelegateWin() {}
 
-gfx::Image* AppMetroInfoBarDelegateWin::GetIcon() const {
-  return &ResourceBundle::GetSharedInstance().GetNativeImageNamed(
-      chrome::GetAppListIconResourceId());
+int AppMetroInfoBarDelegateWin::GetIconID() const {
+  return chrome::GetAppListIconResourceId();
 }
 
 string16 AppMetroInfoBarDelegateWin::GetMessageText() const {
   return l10n_util::GetStringUTF16(mode_ == SHOW_APP_LIST ?
       IDS_WIN8_INFOBAR_DESKTOP_RESTART_FOR_APP_LIST :
       IDS_WIN8_INFOBAR_DESKTOP_RESTART_FOR_PACKAGED_APP);
 }
 
 string16 AppMetroInfoBarDelegateWin::GetButtonLabel(
     InfoBarButton button) const {
@@ skipping 31 matching lines @@
   content::OpenURLParams params(
       GURL("https://support.google.com/chrome/?p=ib_redirect_to_desktop"),
       content::Referrer(),
       (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition,
       content::PAGE_TRANSITION_LINK, false);
   web_contents()->OpenURL(params);
   return false;
 }
 
 }  // namespace chrome