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

Unified Diff: ash/common/system/chromeos/network/network_state_list_detailed_view.cc

Issue 2456783005: [ash-md] Changed the style of ink drop applied to system menu icon buttons. (Closed)
Patch Set: Addressed review comments. 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
« no previous file with comments | « no previous file | ash/common/system/tiles/tiles_default_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/system/chromeos/network/network_state_list_detailed_view.cc
diff --git a/ash/common/system/chromeos/network/network_state_list_detailed_view.cc b/ash/common/system/chromeos/network/network_state_list_detailed_view.cc
index a3e43b69e1d8c188bd29b6eeb227d19706c48ca8..3ca30f68a8eb8bd8d88596b1bb447bccf6a00acd 100644
--- a/ash/common/system/chromeos/network/network_state_list_detailed_view.cc
+++ b/ash/common/system/chromeos/network/network_state_list_detailed_view.cc
@@ -474,13 +474,15 @@ void NetworkStateListDetailedView::CreateExtraTitleRowButtons() {
if (login_ == LoginStatus::LOCKED)
return;
- info_button_md_ = new SystemMenuButton(this, kSystemMenuInfoIcon,
- IDS_ASH_STATUS_TRAY_NETWORK_INFO);
+ info_button_md_ = new SystemMenuButton(
+ this, SystemMenuButton::InkDropStyle::SQUARE, kSystemMenuInfoIcon,
+ IDS_ASH_STATUS_TRAY_NETWORK_INFO);
title_row()->AddViewToTitleRow(info_button_md_);
if (login_ != LoginStatus::NOT_LOGGED_IN) {
settings_button_md_ = new SystemMenuButton(
- this, kSystemMenuSettingsIcon, IDS_ASH_STATUS_TRAY_NETWORK_SETTINGS);
+ this, SystemMenuButton::InkDropStyle::SQUARE, kSystemMenuSettingsIcon,
+ IDS_ASH_STATUS_TRAY_NETWORK_SETTINGS);
// Allow the user to access settings only if user is logged in
// and showing settings is allowed. There are situations (supervised user
@@ -491,9 +493,9 @@ void NetworkStateListDetailedView::CreateExtraTitleRowButtons() {
title_row()->AddViewToTitleRow(settings_button_md_);
} else {
- proxy_settings_button_md_ =
- new SystemMenuButton(this, kSystemMenuSettingsIcon,
- IDS_ASH_STATUS_TRAY_NETWORK_PROXY_SETTINGS);
+ proxy_settings_button_md_ = new SystemMenuButton(
+ this, SystemMenuButton::InkDropStyle::SQUARE, kSystemMenuSettingsIcon,
+ IDS_ASH_STATUS_TRAY_NETWORK_PROXY_SETTINGS);
title_row()->AddViewToTitleRow(proxy_settings_button_md_);
}
« no previous file with comments | « no previous file | ash/common/system/tiles/tiles_default_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698