[InfoBar] Add InfoBarDelegate::GetIconID()

chrome/browser/ui/startup/session_crashed_prompt.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/ui/startup/session_crashed_prompt.h"
 
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/sessions/session_restore.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/dom_storage_context.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/browser/web_contents.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"
 
 
 // static
 void SessionCrashedInfoBarDelegate::Create(Browser* browser) {
   // Assume that if the user is launching incognito they were previously
   // running incognito so that we have nothing to restore from.
   if (browser->profile()->IsOffTheRecord())
     return;
 
   // In ChromeBot tests, there might be a race. This line appears to get
@@ skipping 25 matching lines @@
 
 SessionCrashedInfoBarDelegate::~SessionCrashedInfoBarDelegate() {
   // If the info bar wasn't accepted, it was either dismissed or expired. In
   // that case, session restore won't happen.
   if (!accepted_ && !removed_notification_received_) {
     content::BrowserContext::GetDefaultStoragePartition(profile_)
         ->GetDOMStorageContext()->StartScavengingUnusedSessionStorage();
   }
 }
 
-gfx::Image* SessionCrashedInfoBarDelegate::GetIcon() const {
-  return &ResourceBundle::GetSharedInstance().GetNativeImageNamed(
-      IDR_INFOBAR_RESTORE_SESSION);
+int SessionCrashedInfoBarDelegate::GetIconID() const {
+  return IDR_INFOBAR_RESTORE_SESSION;
 }
 
 string16 SessionCrashedInfoBarDelegate::GetMessageText() const {
   return l10n_util::GetStringUTF16(IDS_SESSION_CRASHED_VIEW_MESSAGE);
 }
 
 int SessionCrashedInfoBarDelegate::GetButtons() const {
   return BUTTON_OK;
 }
 
@@ skipping 31 matching lines @@
   DCHECK(type == chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REMOVED);
   if (content::Details<std::pair<InfoBarDelegate*, bool> >(details)->first !=
       this)
     return;
   if (!accepted_) {
     content::BrowserContext::GetDefaultStoragePartition(profile_)->
         GetDOMStorageContext()->StartScavengingUnusedSessionStorage();
     removed_notification_received_ = true;
   }
 }