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

Unified Diff: chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

Issue 357323002: Tray elements behave appropriately on the multiple signin screen (more like lock screen) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed nits Created 6 years, 5 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: chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
diff --git a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
index 19e7ec25bd8f89bb051e4a6c7a460ff9388f858b..e46c687c8de868523befc63b9b43857f789a1cdd 100644
--- a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
+++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
@@ -220,6 +220,10 @@ void BluetoothDeviceConnectError(
}
void ShowSettingsSubPageForActiveUser(const std::string& sub_page) {
+ ash::Shell::GetInstance()
+ ->session_state_delegate()
+ ->HideMultiUserSigninScreen();
+
chrome::ShowSettingsSubPageForProfile(
ProfileManager::GetActiveUserProfile(), sub_page);
}
@@ -843,6 +847,10 @@ void SystemTrayDelegateChromeOS::ShowMobileSetupDialog(
void SystemTrayDelegateChromeOS::ShowOtherNetworkDialog(
const std::string& type) {
+ ash::Shell::GetInstance()
+ ->session_state_delegate()
+ ->HideMultiUserSigninScreen();
+
if (type == shill::kTypeCellular) {
ChooseMobileNetworkDialog::ShowDialog(GetNativeWindow());
return;

Powered by Google App Engine
This is Rietveld 408576698