Fix crash when JS alert from background page appears during lock screen

Fix crash when JS alert from background page appears during lock screen

+ Added test that caused crash without changes in ash/wm/stacking_controller.cc
+ Changes in chrome/browser/ui/views/frame/browser_view.cc prevents stealing focus loop

BUG=226141
TEST=ShellTest.CreateLockScreenModalWindow

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=203191

[Dmitry Polukhin, 2013-05-29 14:39:49]

sky@ please do OWNER review

[sky, 2013-05-29 15:25:47]

How about a test?

[Dmitry Polukhin, 2013-05-30 12:45:12]

Test added, PTAL.

[sky, 2013-05-30 14:53:47]

https://codereview.chromium.org/15690015/diff/24001/ash/shell_unittest.cc
File ash/shell_unittest.cc (right):

https://codereview.chromium.org/15690015/diff/24001/ash/shell_unittest.cc#new...
ash/shell_unittest.cc:278: TestModalDialogDelegate* dilaog_delegate = new
TestModalDialogDelegate();
dilaog -> dialog

https://codereview.chromium.org/15690015/diff/24001/ash/wm/stacking_controlle...
File ash/wm/stacking_controller.cc (right):

https://codereview.chromium.org/15690015/diff/24001/ash/wm/stacking_controlle...
ash/wm/stacking_controller.cc:134: int window_container_id =
window->transient_parent() ?
This code would be less mysterious if you made it early out, eg:

if (!window->transient_parent())
  return GetContainerById(root, internal::kShellWindowId_SystemModalContainer);
}

In fact you could combine this with the if on 122 (keeping your comment).

[Dmitry Polukhin, 2013-05-30 15:09:02]

PTAL

https://codereview.chromium.org/15690015/diff/24001/ash/shell_unittest.cc
File ash/shell_unittest.cc (right):

https://codereview.chromium.org/15690015/diff/24001/ash/shell_unittest.cc#new...
ash/shell_unittest.cc:278: TestModalDialogDelegate* dilaog_delegate = new
TestModalDialogDelegate();
On 2013/05/30 14:53:47, sky wrote:
> dilaog -> dialog

Done.

https://codereview.chromium.org/15690015/diff/24001/ash/wm/stacking_controlle...
File ash/wm/stacking_controller.cc (right):

https://codereview.chromium.org/15690015/diff/24001/ash/wm/stacking_controlle...
ash/wm/stacking_controller.cc:134: int window_container_id =
window->transient_parent() ?
On 2013/05/30 14:53:47, sky wrote:
> This code would be less mysterious if you made it early out, eg:
> 
> if (!window->transient_parent())
>   return GetContainerById(root,
internal::kShellWindowId_SystemModalContainer);
> }
> 
> In fact you could combine this with the if on 122 (keeping your comment).

Done.

[sky, 2013-05-30 15:23:35]

LGTM

[commit-bot: I haz the power, 2013-05-30 15:33:35]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/dpolukhin@chromium.org/15690015/33003

[commit-bot: I haz the power, 2013-05-30 18:59:29]

Change committed as 203191