[reland] views: Move MenuButton from TextButton to LabelButton.

chrome/browser/ui/views/infobars/extension_infobar.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/extension_infobar.h"
 
 #include "chrome/browser/extensions/extension_context_menu_model.h"
 #include "chrome/browser/extensions/extension_infobar_delegate.h"
 #include "chrome/browser/extensions/extension_view_host.h"
 #include "chrome/browser/extensions/image_loader.h"
@@ skipping 190 matching lines @@
     icon = rb.GetImageNamed(IDR_EXTENSIONS_SECTION).ToImageSkia();
   else
     icon = image.ToImageSkia();
 
   if (icon_as_menu_) {
     const gfx::ImageSkia* drop_image =
         rb.GetImageNamed(IDR_APP_DROPARROW).ToImageSkia();
 
     gfx::CanvasImageSource* source = new MenuImageSource(*icon, *drop_image);
     gfx::ImageSkia menu_image = gfx::ImageSkia(source, source->size());
-    icon_as_menu_->SetIcon(menu_image);
+    icon_as_menu_->SetImage(views::Button::STATE_NORMAL, menu_image);
   } else {
     icon_as_image_->SetImage(*icon);
   }
 
   infobar_icon_->SizeToPreferredSize();
   infobar_icon_->SetVisible(true);
 
   Layout();
 }
 
 ExtensionInfoBarDelegate* ExtensionInfoBar::GetDelegate() {
   return delegate()->AsExtensionInfoBarDelegate();
 }
 
 const ExtensionInfoBarDelegate* ExtensionInfoBar::GetDelegate() const {
   return delegate()->AsExtensionInfoBarDelegate();
 }
 
 int ExtensionInfoBar::NonExtensionViewWidth() const {
   return infobar_icon_->width() + kIconHorizontalMargin;
 }