| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/chromeos/login/lock_window_aura.h" | 5 #include "chrome/browser/chromeos/login/lock_window_aura.h" |
| 6 | 6 |
| 7 #include "ash/shell.h" | 7 #include "ash/shell.h" |
| 8 #include "ash/shell_window_ids.h" | 8 #include "ash/shell_window_ids.h" |
| 9 #include "ash/wm/window_animations.h" | 9 #include "ash/wm/window_animations.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| 11 #include "ui/aura/root_window.h" | |
| 12 #include "ui/aura/window.h" | 11 #include "ui/aura/window.h" |
| 12 #include "ui/aura/window_event_dispatcher.h" |
| 13 | 13 |
| 14 namespace chromeos { | 14 namespace chromeos { |
| 15 | 15 |
| 16 LockWindow* LockWindow::Create() { | 16 LockWindow* LockWindow::Create() { |
| 17 LockWindowAura* lock_window = new LockWindowAura(); | 17 LockWindowAura* lock_window = new LockWindowAura(); |
| 18 // Cancel existing touch events when screen is locked. | 18 // Cancel existing touch events when screen is locked. |
| 19 ui::GestureRecognizer::Get()->TransferEventsTo( | 19 ui::GestureRecognizer::Get()->TransferEventsTo( |
| 20 lock_window->GetNativeWindow(), NULL); | 20 lock_window->GetNativeWindow(), NULL); |
| 21 return lock_window; | 21 return lock_window; |
| 22 } | 22 } |
| (...skipping 29 matching lines...) Expand all Loading... |
| 52 params.parent = | 52 params.parent = |
| 53 ash::Shell::GetContainer( | 53 ash::Shell::GetContainer( |
| 54 ash::Shell::GetPrimaryRootWindow(), | 54 ash::Shell::GetPrimaryRootWindow(), |
| 55 ash::internal::kShellWindowId_LockScreenContainer); | 55 ash::internal::kShellWindowId_LockScreenContainer); |
| 56 views::Widget::Init(params); | 56 views::Widget::Init(params); |
| 57 views::corewm::SetWindowVisibilityAnimationTransition( | 57 views::corewm::SetWindowVisibilityAnimationTransition( |
| 58 GetNativeView(), views::corewm::ANIMATE_NONE); | 58 GetNativeView(), views::corewm::ANIMATE_NONE); |
| 59 } | 59 } |
| 60 | 60 |
| 61 } // namespace chromeos | 61 } // namespace chromeos |
| OLD | NEW |