Introduce SystemMenuButton for Ash material design

ash/common/system/tray/special_popup_row.cc

 // Copyright (c) 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 "ash/common/system/tray/special_popup_row.h"
 
 #include "ash/common/ash_constants.h"
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/system/tray/hover_highlight_view.h"
+#include "ash/common/system/tray/system_menu_button.h"
 #include "ash/common/system/tray/throbber_view.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_popup_header_button.h"
 #include "ash/common/system/tray/tray_popup_item_style.h"
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/insets.h"
@@ skipping 69 matching lines @@
       new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 0);
   SetLayoutManager(box_layout);
   content_ = view;
   // TODO(tdanderson): Consider moving this logic to a BoxLayout subclass.
   AddChildViewAt(content_, views_before_content_container_ ? 1 : 0);
   if (MaterialDesignController::IsSystemTrayMenuMaterial())
     box_layout->SetFlexForView(content_, 1);
 }
 
 views::Button* SpecialPopupRow::AddBackButton(views::ButtonListener* listener) {
-  return AddImageButton(listener, kSystemMenuArrowBackIcon,
-                        IDS_ASH_STATUS_TRAY_PREVIOUS_MENU, false);
+  return AddSystemMenuButton(listener, kSystemMenuArrowBackIcon,
+                             IDS_ASH_STATUS_TRAY_PREVIOUS_MENU, false);
 }
 
 views::Button* SpecialPopupRow::AddSettingsButton(
     views::ButtonListener* listener) {
-  return AddImageButton(listener, kSystemMenuSettingsIcon,
-                        IDS_ASH_STATUS_TRAY_SETTINGS, true);
+  return AddSystemMenuButton(listener, kSystemMenuSettingsIcon,
+                             IDS_ASH_STATUS_TRAY_SETTINGS, true);
 }
 
-views::ImageButton* SpecialPopupRow::AddImageButton(
+SystemMenuButton* SpecialPopupRow::AddSystemMenuButton(

[James Cook, 2016/09/23 18:32:16]

Thanks for renaming this.

     views::ButtonListener* listener,
     const gfx::VectorIcon& icon,
     int accessible_name_id,
     bool after_content) {
-  views::ImageButton* button = new views::ImageButton(listener);
-
-  gfx::ImageSkia image = gfx::CreateVectorIcon(icon, kMenuIconColor);
-  button->SetImage(views::Button::STATE_NORMAL, &image);
-  const int horizontal_padding = (kMenuButtonSize - image.width()) / 2;
-  const int vertical_padding = (kMenuButtonSize - image.height()) / 2;
-  button->SetBorder(
-      views::Border::CreateEmptyBorder(vertical_padding, horizontal_padding,
-                                       vertical_padding, horizontal_padding));
-
-  ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
-  button->SetTooltipText(bundle.GetLocalizedString(accessible_name_id));
-  button->SetFocusForPlatform();
-  button->SetFocusPainter(views::Painter::CreateSolidFocusPainter(
-      kFocusBorderColor, gfx::Insets(1, 1, 1, 1)));
+  SystemMenuButton* button =
+      new SystemMenuButton(listener, icon, accessible_name_id);
 
   if (after_content)
     AddViewAfterContent(button);
   else
     AddViewBeforeContent(button);
 
   return button;
 }
 
 views::ToggleButton* SpecialPopupRow::AddToggleButton(
@@ skipping 144 matching lines @@
 
   container->SetBorder(
       views::Border::CreateEmptyBorder(0, kTrayPopupPaddingHorizontal, 0, 0));
 
   container->SetAccessibleName(
       rb.GetLocalizedString(IDS_ASH_STATUS_TRAY_PREVIOUS_MENU));
   SetContent(container);
 }
 
 }  // namespace ash