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

Unified Diff: ash/system/user/user_view.cc

Issue 496563002: Multiprofile security: Show a warning messagebox when desktop casting/sharing is turned on upon user (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 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/system/user/user_view.cc
diff --git a/ash/system/user/user_view.cc b/ash/system/user/user_view.cc
index 689764fc5ffb6ab27d487fd3e674164279cd83dc..52f128da1a52fd41b6430984cfed08dbb0682306 100644
--- a/ash/system/user/user_view.cc
+++ b/ash/system/user/user_view.cc
@@ -400,8 +400,11 @@ void UserView::AddUserCard(user::LoginStatus login) {
max_card_width -= logout_button_->GetPreferredSize().width();
user_card_view_ =
new UserCardView(login, max_card_width, multiprofile_index_);
- bool clickable = IsMultiProfileSupportedAndUserActive() ||
- IsMultiAccountSupportedAndUserActive();
+ // The entry is clickable when no system modal dialog is open and one of the
+ // multi user options is active.
+ bool clickable = !Shell::GetInstance()->IsSystemModalWindowOpen() &&
+ (IsMultiProfileSupportedAndUserActive() ||
+ IsMultiAccountSupportedAndUserActive());
if (clickable) {
// To allow the border to start before the icon, reduce the size before and
// add an inset to the icon to get the spacing.

Powered by Google App Engine
This is Rietveld 408576698