| 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..74127e15f69f7d5ab1e3ea6fb3b0103064b59d2d 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,14 @@ 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()
|
| + ->GetSessionState() ==
|
| + ash::SessionStateDelegate::SESSION_STATE_LOGIN_SECONDARY);
|
| +
|
| + if (login_ != user::LOGGED_IN_NONE && login_ != user::LOGGED_IN_LOCKED &&
|
| + !userAddingRunning)
|
| AppendSettings();
|
| AppendHeaderEntry();
|
|
|
|
|