| Index: chrome/browser/chromeos/login/webui_login_display_host.cc
|
| diff --git a/chrome/browser/chromeos/login/webui_login_display_host.cc b/chrome/browser/chromeos/login/webui_login_display_host.cc
|
| index 46a636ee9af41e28097a29ea9d58fc7e1e03961d..28681c90474e3954a5640020abdaa069697f6383 100644
|
| --- a/chrome/browser/chromeos/login/webui_login_display_host.cc
|
| +++ b/chrome/browser/chromeos/login/webui_login_display_host.cc
|
| @@ -15,7 +15,6 @@
|
|
|
| #if defined(USE_AURA)
|
| #include "ash/shell.h"
|
| -#include "ash/shell_window_ids.h"
|
| #include "ui/aura/window.h"
|
| #endif
|
|
|
| @@ -131,9 +130,9 @@ void WebUILoginDisplayHost::LoadURL(const GURL& url) {
|
| login_view_->Init(login_window_);
|
|
|
| #if defined(USE_AURA)
|
| - ash::Shell::GetInstance()->GetContainer(
|
| - ash::internal::kShellWindowId_LockScreenContainer)->
|
| - AddChild(login_window_->GetNativeView());
|
| + login_window_->GetNativeView()->set_stops_event_propagation(true);
|
| + // Let the shell pick the container.
|
| + login_window_->GetNativeView()->SetParent(NULL);
|
| #endif
|
|
|
| login_window_->SetContentsView(login_view_);
|
|
|