| Index: chrome/browser/chromeos/login/ui/lock_window.cc
|
| diff --git a/chrome/browser/chromeos/login/ui/lock_window.cc b/chrome/browser/chromeos/login/ui/lock_window.cc
|
| index c810969bf7f60444fbb15348b8c1c2c10633da4b..a2c30f7edbeb0a387c3842a7b02e93f0b48e118b 100644
|
| --- a/chrome/browser/chromeos/login/ui/lock_window.cc
|
| +++ b/chrome/browser/chromeos/login/ui/lock_window.cc
|
| @@ -14,8 +14,7 @@
|
|
|
| namespace chromeos {
|
|
|
| -LockWindow::LockWindow(views::View* initially_focused_view)
|
| - : initially_focused_view_(initially_focused_view) {
|
| +LockWindow::LockWindow() {
|
| ui::GestureRecognizer::Get()->CancelActiveTouchesExcept(nullptr);
|
|
|
| views::Widget::InitParams params(
|
| @@ -47,7 +46,8 @@ const views::Widget* LockWindow::GetWidget() const {
|
| }
|
|
|
| views::View* LockWindow::GetInitiallyFocusedView() {
|
| - return initially_focused_view_;
|
| + // There are multiple GetContentsView definitions; use the views::Widget one.
|
| + return views::Widget::GetContentsView();
|
| }
|
|
|
| } // namespace chromeos
|
|
|