[Toolbar] Use TEXTBUTTON borders.

chrome/browser/ui/views/toolbar/toolbar_button.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/views/toolbar/toolbar_button.h"
 
 #include "base/bind.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "grit/theme_resources.h"
 #include "grit/ui_strings.h"
@@ skipping 20 matching lines @@
 ToolbarButton::~ToolbarButton() {
 }
 
 void ToolbarButton::Init() {
   SetFocusable(false);
   SetAccessibilityFocusable(true);
 
   // Provides the hover/pressed style used by buttons in the toolbar.
   views::LabelButtonBorder* border =
       new views::LabelButtonBorder(views::Button::STYLE_TEXTBUTTON);
-  const int kHoverImages[] = IMAGE_GRID(IDR_TOOLBAR_BUTTON_HOVER);

[msw, 2013/12/17 01:02:36]

If this is ok, we'll also need to remove the IDRs and image assets themselves!

-  border->SetPainter(false, views::Button::STATE_HOVERED,
-                     views::Painter::CreateImageGridPainter(
-                         kHoverImages));
-  const int kPressedImages[] = IMAGE_GRID(IDR_TOOLBAR_BUTTON_PRESSED);
-  border->SetPainter(false, views::Button::STATE_PRESSED,
-                     views::Painter::CreateImageGridPainter(
-                         kPressedImages));
   set_border(border);
 }
 
 void ToolbarButton::ClearPendingMenu() {
   show_menu_factory_.InvalidateWeakPtrs();
 }
 
 bool ToolbarButton::IsMenuShowing() const {
   return menu_showing_;
 }
@@ skipping 171 matching lines @@
 
   // Need to explicitly clear mouse handler so that events get sent
   // properly after the menu finishes running. If we don't do this, then
   // the first click to other parts of the UI is eaten.
   SetMouseHandler(NULL);
 
   // Set the state back to normal after the drop down menu is closed.
   if (state_ != STATE_DISABLED)
     SetState(STATE_NORMAL);
 }