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

ash/common/system/tiles/tiles_default_view.cc

 // Copyright 2016 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/tiles/tiles_default_view.h"
 
 #include "ash/common/metrics/user_metrics_action.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/system/tray/system_menu_button.h"
 #include "ash/common/system/tray/system_tray.h"
@@ skipping 54 matching lines @@
       views::BoxLayout::MAIN_AXIS_ALIGNMENT_START);
   box_layout->set_cross_axis_alignment(
       views::BoxLayout::CROSS_AXIS_ALIGNMENT_CENTER);
   SetLayoutManager(box_layout);
 
   // Show the buttons in this row as disabled if the user is at the login
   // screen, lock screen, or in a secondary account flow. The exception is
   // |power_button_| which is always shown as enabled.
   const bool disable_buttons = !CanOpenWebUISettings(login_);
 
-  settings_button_ = new SystemMenuButton(this, kSystemMenuSettingsIcon,
-                                          IDS_ASH_STATUS_TRAY_SETTINGS);
+  settings_button_ = new SystemMenuButton(
+      this, SystemMenuButton::InkDropStyle::FLOOD_FILL, kSystemMenuSettingsIcon,
+      IDS_ASH_STATUS_TRAY_SETTINGS);
   if (disable_buttons || !shell->system_tray_delegate()->ShouldShowSettings())
     settings_button_->SetState(views::Button::STATE_DISABLED);
   AddChildView(settings_button_);
   AddSeparator();
 
   help_button_ =
-      new SystemMenuButton(this, kSystemMenuHelpIcon, IDS_ASH_STATUS_TRAY_HELP);
+      new SystemMenuButton(this, SystemMenuButton::InkDropStyle::FLOOD_FILL,
+                           kSystemMenuHelpIcon, IDS_ASH_STATUS_TRAY_HELP);
   if (base::i18n::IsRTL() &&
       base::i18n::GetConfiguredLocale() == kHebrewLocale) {
     // The asset for the help button is a question mark '?'. Normally this asset
     // is flipped in RTL locales, however Hebrew uses the LTR '?'. So the
     // flipping must be disabled. (crbug.com/475237)
     help_button_->EnableCanvasFlippingForRTLUI(false);
   }
   if (disable_buttons)
     help_button_->SetState(views::Button::STATE_DISABLED);
   AddChildView(help_button_);
   AddSeparator();
 
 #if !defined(OS_WIN)
   lock_button_ =
-      new SystemMenuButton(this, kSystemMenuLockIcon, IDS_ASH_STATUS_TRAY_LOCK);
+      new SystemMenuButton(this, SystemMenuButton::InkDropStyle::FLOOD_FILL,
+                           kSystemMenuLockIcon, IDS_ASH_STATUS_TRAY_LOCK);
   if (disable_buttons || !shell->GetSessionStateDelegate()->CanLockScreen())
     lock_button_->SetState(views::Button::STATE_DISABLED);
 
   AddChildView(lock_button_);
   AddSeparator();
 
-  power_button_ = new SystemMenuButton(this, kSystemMenuPowerIcon,
-                                       IDS_ASH_STATUS_TRAY_SHUTDOWN);
+  power_button_ =
+      new SystemMenuButton(this, SystemMenuButton::InkDropStyle::FLOOD_FILL,
+                           kSystemMenuPowerIcon, IDS_ASH_STATUS_TRAY_SHUTDOWN);
   AddChildView(power_button_);
   SystemTrayDelegate* system_tray_delegate = shell->system_tray_delegate();
   system_tray_delegate->AddShutdownPolicyObserver(this);
   system_tray_delegate->ShouldRebootOnShutdown(base::Bind(
       &TilesDefaultView::OnShutdownPolicyChanged, weak_factory_.GetWeakPtr()));
 #endif  // !defined(OS_WIN)
 }
 
 void TilesDefaultView::ButtonPressed(views::Button* sender,
                                      const ui::Event& event) {
@@ skipping 31 matching lines @@
 
 void TilesDefaultView::AddSeparator() {
   views::Separator* separator =
       new views::Separator(views::Separator::HORIZONTAL);
   separator->SetPreferredSize(kHorizontalSeparatorHeight);
   separator->SetColor(kHorizontalSeparatorColor);
   AddChildView(separator);
 }
 
 }  // namespace ash