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/ui/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/window.h" | 11 #include "ui/aura/window.h" |
12 #include "ui/aura/window_event_dispatcher.h" | 12 #include "ui/aura/window_event_dispatcher.h" |
13 | 13 |
14 namespace chromeos { | 14 namespace chromeos { |
15 | 15 |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
51 // TODO(oshima): move the lock screen harness to ash. | 51 // TODO(oshima): move the lock screen harness to ash. |
52 params.parent = | 52 params.parent = |
53 ash::Shell::GetContainer(ash::Shell::GetPrimaryRootWindow(), | 53 ash::Shell::GetContainer(ash::Shell::GetPrimaryRootWindow(), |
54 ash::kShellWindowId_LockScreenContainer); | 54 ash::kShellWindowId_LockScreenContainer); |
55 views::Widget::Init(params); | 55 views::Widget::Init(params); |
56 wm::SetWindowVisibilityAnimationTransition( | 56 wm::SetWindowVisibilityAnimationTransition( |
57 GetNativeView(), wm::ANIMATE_NONE); | 57 GetNativeView(), wm::ANIMATE_NONE); |
58 } | 58 } |
59 | 59 |
60 } // namespace chromeos | 60 } // namespace chromeos |
OLD | NEW |