Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2536)

Unified Diff: ash/common/system/tray/special_popup_row.cc

Issue 2456783005: [ash-md] Changed the style of ink drop applied to system menu icon buttons. (Closed)
Patch Set: Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ash/common/system/tray/special_popup_row.cc
diff --git a/ash/common/system/tray/special_popup_row.cc b/ash/common/system/tray/special_popup_row.cc
index 51bfd3a4ff33915fb4f62f3b7a4d6e242a03f286..53ac53250baf3e79686078f23b7ca962024f7961 100644
--- a/ash/common/system/tray/special_popup_row.cc
+++ b/ash/common/system/tray/special_popup_row.cc
@@ -101,7 +101,8 @@ void SpecialPopupRow::SetContent(views::View* view) {
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;
}
@@ -110,7 +111,8 @@ 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);
@@ -120,8 +122,9 @@ views::CustomButton* SpecialPopupRow::AddSettingsButton(
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);

Powered by Google App Engine
This is Rietveld 408576698