[ash-md] Changed the style of ink drop applied to system menu icon buttons.

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"
@@ skipping 83 matching lines @@
   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) {
   SystemMenuButton* button = new SystemMenuButton(
-      listener, kSystemMenuArrowBackIcon, IDS_ASH_STATUS_TRAY_PREVIOUS_MENU);
+      listener, SystemMenuButton::InkDropStyle::SQUARE,
+      kSystemMenuArrowBackIcon, IDS_ASH_STATUS_TRAY_PREVIOUS_MENU);
   AddViewBeforeContent(button);
   return button;
 }
 
 views::CustomButton* SpecialPopupRow::AddSettingsButton(
     views::ButtonListener* listener,
     LoginStatus status) {
   SystemMenuButton* button = new SystemMenuButton(
-      listener, kSystemMenuSettingsIcon, IDS_ASH_STATUS_TRAY_SETTINGS);
+      listener, SystemMenuButton::InkDropStyle::SQUARE, kSystemMenuSettingsIcon,
+      IDS_ASH_STATUS_TRAY_SETTINGS);
   if (!CanOpenWebUISettings(status))
     button->SetState(views::Button::STATE_DISABLED);
   AddViewAfterContent(button);
   return button;
 }
 
 views::CustomButton* SpecialPopupRow::AddHelpButton(
     views::ButtonListener* listener,
     LoginStatus status) {
-  SystemMenuButton* button = new SystemMenuButton(listener, kSystemMenuHelpIcon,
-                                                  IDS_ASH_STATUS_TRAY_HELP);
+  SystemMenuButton* button =
+      new SystemMenuButton(listener, SystemMenuButton::InkDropStyle::SQUARE,
+                           kSystemMenuHelpIcon, IDS_ASH_STATUS_TRAY_HELP);
   if (!CanOpenWebUISettings(status))
     button->SetState(views::Button::STATE_DISABLED);
   AddViewAfterContent(button);
   return button;
 }
 
 views::ToggleButton* SpecialPopupRow::AddToggleButton(
     views::ButtonListener* listener) {
   // TODO(tdanderson): Define the focus rect for ToggleButton.
   views::ToggleButton* toggle = new views::ToggleButton(listener);
@@ skipping 149 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