[InfoBar] Add InfoBarDelegate::GetIconID()

chrome/browser/ui/views/infobars/infobar_view.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/views/infobars/infobar_view.h"
 
 #if defined(OS_WIN)
 #include <shellapi.h>
 #endif
 
@@ skipping 198 matching lines @@
   close_button_->SetBounds(std::max(start_x + ContentMinimumWidth(),
       width() - kHorizontalPadding - button_size.width()), OffsetY(button_size),
       button_size.width(), button_size.height());
 }
 
 void InfoBarView::ViewHierarchyChanged(
     const ViewHierarchyChangedDetails& details) {
   View::ViewHierarchyChanged(details);
 
   if (details.is_add && (details.child == this) && (close_button_ == NULL)) {
-    gfx::Image* image = delegate()->GetIcon();
-    if (image) {
+    gfx::Image image = delegate()->GetIcon();
+    if (!image.IsEmpty()) {
       icon_ = new views::ImageView;
-      icon_->SetImage(image->ToImageSkia());
+      icon_->SetImage(image.ToImageSkia());
       AddChildView(icon_);
     }
 
     close_button_ = new views::ImageButton(this);
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     close_button_->SetImage(views::CustomButton::STATE_NORMAL,
                             rb.GetImageNamed(IDR_CLOSE_1).ToImageSkia());
     close_button_->SetImage(views::CustomButton::STATE_HOVERED,
                             rb.GetImageNamed(IDR_CLOSE_1_H).ToImageSkia());
     close_button_->SetImage(views::CustomButton::STATE_PRESSED,
@@ skipping 147 matching lines @@
   // This will trigger some screen readers to read the entire contents of this
   // infobar.
   if (focused_before && focused_now && !Contains(focused_before) &&
       Contains(focused_now)) {
     NotifyAccessibilityEvent(ui::AccessibilityTypes::EVENT_ALERT, true);
   }
 }
 
 void InfoBarView::OnDidChangeFocus(View* focused_before, View* focused_now) {
 }