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

Unified Diff: ash/system/ime/tray_ime.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: Update after review 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
« no previous file with comments | « ash/system/date/date_default_view.cc ('k') | ash/system/tray_accessibility.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/ime/tray_ime.cc
diff --git a/ash/system/ime/tray_ime.cc b/ash/system/ime/tray_ime.cc
index 3bd0296d06325c05a455c05575dc54e77da18f70..b410f43013fb65558bb85326735208d5164ef3ab 100644
--- a/ash/system/ime/tray_ime.cc
+++ b/ash/system/ime/tray_ime.cc
@@ -8,6 +8,7 @@
#include "ash/metrics/user_metrics_recorder.h"
#include "ash/root_window_controller.h"
+#include "ash/session/session_state_delegate.h"
#include "ash/shelf/shelf_widget.h"
#include "ash/shell.h"
#include "ash/system/tray/hover_highlight_view.h"
@@ -114,7 +115,12 @@ class IMEDetailedView : public TrayDetailsView,
AppendIMEList(list);
if (!property_list.empty())
AppendIMEProperties(property_list);
- if (login_ != user::LOGGED_IN_NONE && login_ != user::LOGGED_IN_LOCKED)
+ bool userAddingRunning = ash::Shell::GetInstance()
+ ->session_state_delegate()
+ ->IsInSecondaryLoginScreen();
+
+ if (login_ != user::LOGGED_IN_NONE && login_ != user::LOGGED_IN_LOCKED &&
+ !userAddingRunning)
AppendSettings();
AppendHeaderEntry();
« no previous file with comments | « ash/system/date/date_default_view.cc ('k') | ash/system/tray_accessibility.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698