First stab at MD text buttons

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"
 
 #include <algorithm>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 13 matching lines @@
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/gfx/vector_icons_public.h"
 #include "ui/native_theme/common_theme.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/resources/grit/ui_resources.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/button/label_button_border.h"
+#include "ui/views/controls/button/md_text_button.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/non_client_view.h"
 
 
@@ skipping 61 matching lines @@
   views::Link* link = new views::Link(text);
   link->SetFontList(GetFontList());
   link->SizeToPreferredSize();
   link->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   link->set_listener(listener);
   link->SetBackgroundColor(background()->get_color());
   return link;
 }
 
 // static
+views::Button* InfoBarView::CreateTextButton(
+    views::ButtonListener* listener,
+    const base::string16& text) {
+  if (!ui::MaterialDesignController::IsModeMaterial())
+    return CreateLabelButton(listener, text);
+
+  return new views::MdTextButton(listener, text);
+}
+
+// static
 views::LabelButton* InfoBarView::CreateLabelButton(
     views::ButtonListener* listener,
     const base::string16& text) {
   views::LabelButton* button = new views::LabelButton(listener, text);
-  if (ui::MaterialDesignController::IsModeMaterial()) {
-    button->SetStyle(views::Button::STYLE_BUTTON);
-  } else {
-    scoped_ptr<views::LabelButtonAssetBorder> button_border(
-        new views::LabelButtonAssetBorder(views::Button::STYLE_TEXTBUTTON));
-    const int kNormalImageSet[] = IMAGE_GRID(IDR_INFOBARBUTTON_NORMAL);
-    button_border->SetPainter(
-        false, views::Button::STATE_NORMAL,
-        views::Painter::CreateImageGridPainter(kNormalImageSet));
-    const int kHoveredImageSet[] = IMAGE_GRID(IDR_INFOBARBUTTON_HOVER);
-    button_border->SetPainter(
-        false, views::Button::STATE_HOVERED,
-        views::Painter::CreateImageGridPainter(kHoveredImageSet));
-    const int kPressedImageSet[] = IMAGE_GRID(IDR_INFOBARBUTTON_PRESSED);
-    button_border->SetPainter(
-        false, views::Button::STATE_PRESSED,
-        views::Painter::CreateImageGridPainter(kPressedImageSet));
+  scoped_ptr<views::LabelButtonAssetBorder> button_border(
+      new views::LabelButtonAssetBorder(views::Button::STYLE_TEXTBUTTON));
+  const int kNormalImageSet[] = IMAGE_GRID(IDR_INFOBARBUTTON_NORMAL);
+  button_border->SetPainter(
+      false, views::Button::STATE_NORMAL,
+      views::Painter::CreateImageGridPainter(kNormalImageSet));
+  const int kHoveredImageSet[] = IMAGE_GRID(IDR_INFOBARBUTTON_HOVER);
+  button_border->SetPainter(
+      false, views::Button::STATE_HOVERED,
+      views::Painter::CreateImageGridPainter(kHoveredImageSet));
+  const int kPressedImageSet[] = IMAGE_GRID(IDR_INFOBARBUTTON_PRESSED);
+  button_border->SetPainter(
+      false, views::Button::STATE_PRESSED,
+      views::Painter::CreateImageGridPainter(kPressedImageSet));
 
-    button->SetBorder(button_border.Pass());
-    button->set_animate_on_state_change(false);
-    button->SetTextColor(views::Button::STATE_NORMAL, GetInfobarTextColor());
-    button->SetTextColor(views::Button::STATE_HOVERED, GetInfobarTextColor());
-    ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-    button->SetFontList(rb.GetFontList(ui::ResourceBundle::MediumFont));
-  }
+  button->SetBorder(std::move(button_border));
+  button->set_animate_on_state_change(false);
+  button->SetTextColor(views::Button::STATE_NORMAL, GetInfobarTextColor());
+  button->SetTextColor(views::Button::STATE_HOVERED, GetInfobarTextColor());
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
+  button->SetFontList(rb.GetFontList(ui::ResourceBundle::MediumFont));
   button->SetFocusable(true);
   return button;
 }
 
 // static
 void InfoBarView::AssignWidths(Labels* labels, int available_width) {
   std::sort(labels->begin(), labels->end(), SortLabelsByDecreasingWidth);
   AssignWidthsSorted(labels, available_width);
 }
 
@@ skipping 250 matching lines @@
 void InfoBarView::OnWillChangeFocus(View* focused_before, View* focused_now) {
   views::ExternalFocusTracker::OnWillChangeFocus(focused_before, focused_now);
 
   // 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::AX_EVENT_ALERT, true);
   }
 }