| Index: ash/login/ui/lock_screen.cc
|
| diff --git a/ash/login/ui/lock_screen.cc b/ash/login/ui/lock_screen.cc
|
| index d36034d7da7723e9f2c5256124745f97d368453a..baaf5bfd80b602c59fc51ead9cfa6aae0027c8f9 100644
|
| --- a/ash/login/ui/lock_screen.cc
|
| +++ b/ash/login/ui/lock_screen.cc
|
| @@ -5,14 +5,22 @@
|
| #include "ash/login/ui/lock_screen.h"
|
|
|
| #include "ash/login/ui/lock_contents_view.h"
|
| +#include "ash/login/ui/lock_window.h"
|
| +#include "ui/display/display.h"
|
| +#include "ui/display/screen.h"
|
| #include "ui/views/widget/widget.h"
|
|
|
| namespace ash {
|
|
|
| -void ShowLockScreenInWidget(views::Widget* widget) {
|
| +bool ShowLockScreen() {
|
| + LockWindow* window = new LockWindow();
|
| + window->SetBounds(display::Screen::GetScreen()->GetPrimaryDisplay().bounds());
|
| +
|
| views::View* contents = new LockContentsView();
|
| - widget->SetContentsView(contents);
|
| - widget->Show();
|
| + window->SetContentsView(contents);
|
| + window->Show();
|
| +
|
| + return true;
|
| }
|
|
|
| } // namespace ash
|
|
|