Remove pre-MD infobar code (on Views).

chrome/browser/ui/views/infobars/infobar_view.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_INFOBARS_INFOBAR_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_INFOBARS_INFOBAR_VIEW_H_
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "components/infobars/core/infobar.h"
 #include "components/infobars/core/infobar_container.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/button/vector_icon_button_delegate.h"
 #include "ui/views/controls/menu/menu_types.h"
 #include "ui/views/focus/external_focus_tracker.h"
 #include "ui/views/view_targeter_delegate.h"
 
 namespace ui {
 class MenuModel;
 }
 
 namespace views {
-class ImageButton;
 class ImageView;
 class Label;
 class LabelButton;
 class Link;
 class LinkListener;
-class MdTextButton;
 class MenuButton;
 class MenuRunner;
+class VectorIconButton;
 }  // namespace views
 
 class InfoBarView : public infobars::InfoBar,
                     public views::View,
                     public views::VectorIconButtonDelegate,
                     public views::ExternalFocusTracker,
                     public views::ViewTargeterDelegate {
  public:
   explicit InfoBarView(std::unique_ptr<infobars::InfoBarDelegate> delegate);
 
   const infobars::InfoBarContainer::Delegate* container_delegate() const;
-  const SkPath& fill_path() const { return fill_path_; }
-  const SkPath& stroke_path() const { return stroke_path_; }
 
  protected:
   typedef std::vector<views::Label*> Labels;
 
   static const int kButtonButtonSpacing;
   static const int kEndOfLabelSpacing;
   static const SkColor kTextColor;
 
   ~InfoBarView() override;
 
   // Creates a label with the appropriate font and color for an infobar.
   views::Label* CreateLabel(const base::string16& text) const;
 
   // Creates a link with the appropriate font and color for an infobar.
   // NOTE: Subclasses must ignore link clicks if we're unowned.
   views::Link* CreateLink(const base::string16& text,
                           views::LinkListener* listener) const;
 
-  // Creates a focusable button for use on an infobar. The appearance is
-  // customized for infobars. Used for pre-MD only.
-  // NOTE: Subclasses must ignore button presses if we're unowned.
-  static views::LabelButton* CreateTextButton(views::ButtonListener* listener,
-                                              const base::string16& text);
-
   // Given |labels| and the total |available_width| to display them in, sets
   // each label's size so that the longest label shrinks until it reaches the
   // length of the next-longest label, then both shrink until reaching the
   // length of the next-longest, and so forth.
   static void AssignWidths(Labels* labels, int available_width);
 
   // views::View:
   void Layout() override;
   void ViewHierarchyChanged(
       const ViewHierarchyChangedDetails& details) override;
@@ skipping 53 matching lines @@
                          const gfx::Rect& rect) const override;
 
   // This container holds the children and clips their painting during
   // animation.
   views::View* child_container_;
 
   // The optional icon at the left edge of the InfoBar.
   views::ImageView* icon_;
 
   // The close button at the right edge of the InfoBar.
-  views::ImageButton* close_button_;
-
-  // The paths for the InfoBarBackground to draw, sized according to the heights
-  // above. TODO(estade): remove these when MD is default.
-  SkPath fill_path_;
-  SkPath stroke_path_;
+  views::VectorIconButton* close_button_;
 
   // Used to run the menu.
   std::unique_ptr<views::MenuRunner> menu_runner_;
 
   DISALLOW_COPY_AND_ASSIGN(InfoBarView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_INFOBARS_INFOBAR_VIEW_H_