diff options
| author | skuhne@chromium.org <skuhne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-22 00:47:16 +0000 |
|---|---|---|
| committer | skuhne@chromium.org <skuhne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-22 00:49:08 +0000 |
| commit | 0e316c3f250b7a2cf9d5858df42bbc773d72c403 (patch) | |
| tree | 38d95923d5f88af1f0b18243e2267e7700e4ba43 /ash/system/user/user_view.cc | |
| parent | 38881e37ad2c72fafbeb70b83d1aaaa4f2094e33 (diff) | |
| download | chromium_src-0e316c3f250b7a2cf9d5858df42bbc773d72c403.zip chromium_src-0e316c3f250b7a2cf9d5858df42bbc773d72c403.tar.gz chromium_src-0e316c3f250b7a2cf9d5858df42bbc773d72c403.tar.bz2 | |
Multiprofile security: Show a warning messagebox when desktop
casting/sharing is turned on upon user switch
Purpose of this change:
Asks the user with a system modal dialog box if he wants to
turn off screen sharing/screen casting and then switch users
or abort switching users.
BUG=353170
TEST=TrySwitchingUserTest.*
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=291152
Review URL: https://codereview.chromium.org/496563002
Cr-Commit-Position: refs/heads/master@{#291276}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@291276 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/system/user/user_view.cc')
| -rw-r--r-- | ash/system/user/user_view.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ash/system/user/user_view.cc b/ash/system/user/user_view.cc index 689764f..52f128d 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. |