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

Unified Diff: ash/common/system/cast/tray_cast.cc

Issue 2429923002: Implement all system menu title row buttons for Ash MD (Closed)
Patch Set: OS_WIN define in tests 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/chromeos/bluetooth/tray_bluetooth.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/system/cast/tray_cast.cc
diff --git a/ash/common/system/cast/tray_cast.cc b/ash/common/system/cast/tray_cast.cc
index c130e35db96d6f6eacd1fdbc76d682e22597b193..0ae15ec33b280af972d7824bfdd9af7886e59672 100644
--- a/ash/common/system/cast/tray_cast.cc
+++ b/ash/common/system/cast/tray_cast.cc
@@ -515,6 +515,9 @@ views::View* CastDetailedView::AddToReceiverList(
}
void CastDetailedView::AppendSettingsEntries() {
+ if (MaterialDesignController::IsSystemTrayMenuMaterial())
+ return;
+
// Settings requires a browser window, hide it for non logged in user.
if (login_ == LoginStatus::NOT_LOGGED_IN || login_ == LoginStatus::LOCKED ||
WmShell::Get()->GetSessionStateDelegate()->IsInSecondaryLoginScreen()) {
« no previous file with comments | « no previous file | ash/common/system/chromeos/bluetooth/tray_bluetooth.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698