Skip to content

Commit

Permalink
Make "Join other network dialog" and "Join mobile network dialog" ope…
Browse files Browse the repository at this point in the history
…ns properly on multiple signin screen

BUG=397100

Review URL: https://codereview.chromium.org/443673002

Cr-Commit-Position: refs/heads/master@{#289496}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289496 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
rsorokin@chromium.org committed Aug 14, 2014
1 parent 317c19b commit eb6b97f
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
Original file line number Diff line number Diff line change
Expand Up @@ -137,9 +137,13 @@ void ExtractIMEInfo(const input_method::InputMethodDescriptor& ime,

gfx::NativeWindow GetNativeWindowByStatus(ash::user::LoginStatus login_status,
bool session_started) {
bool isUserAddingRunning = ash::Shell::GetInstance()
->session_state_delegate()
->IsInSecondaryLoginScreen();

int container_id =
(!session_started || login_status == ash::user::LOGGED_IN_NONE ||
login_status == ash::user::LOGGED_IN_LOCKED)
login_status == ash::user::LOGGED_IN_LOCKED || isUserAddingRunning)
? ash::kShellWindowId_LockSystemModalContainer
: ash::kShellWindowId_SystemModalContainer;
return ash::Shell::GetContainer(ash::Shell::GetPrimaryRootWindow(),
Expand Down

0 comments on commit eb6b97f

Please sign in to comment.