| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "ui/aura/root_window.h" | 10 #include "ui/aura/root_window.h" |
| 10 #include "ui/aura/window.h" | 11 #include "ui/aura/window.h" |
| 11 | 12 |
| 12 namespace chromeos { | 13 namespace chromeos { |
| 13 | 14 |
| 14 LockWindow* LockWindow::Create() { | 15 LockWindow* LockWindow::Create() { |
| 15 return new LockWindowAura(); | 16 return new LockWindowAura(); |
| 16 } | 17 } |
| 17 | 18 |
| 18 //////////////////////////////////////////////////////////////////////////////// | 19 //////////////////////////////////////////////////////////////////////////////// |
| (...skipping 21 matching lines...) Expand all Loading... |
| 40 void LockWindowAura::Init() { | 41 void LockWindowAura::Init() { |
| 41 views::Widget::InitParams params( | 42 views::Widget::InitParams params( |
| 42 views::Widget::InitParams::TYPE_WINDOW_FRAMELESS); | 43 views::Widget::InitParams::TYPE_WINDOW_FRAMELESS); |
| 43 params.bounds = gfx::Rect(aura::RootWindow::GetInstance()->GetHostSize()); | 44 params.bounds = gfx::Rect(aura::RootWindow::GetInstance()->GetHostSize()); |
| 44 views::Widget::Init(params); | 45 views::Widget::Init(params); |
| 45 // TODO(flackr): Use a property to specify this container rather than | 46 // TODO(flackr): Use a property to specify this container rather than |
| 46 // depending on shell implementation. | 47 // depending on shell implementation. |
| 47 ash::Shell::GetInstance()->GetContainer( | 48 ash::Shell::GetInstance()->GetContainer( |
| 48 ash::internal::kShellWindowId_LockScreenContainer)-> | 49 ash::internal::kShellWindowId_LockScreenContainer)-> |
| 49 AddChild(GetNativeView()); | 50 AddChild(GetNativeView()); |
| 51 ash::SetWindowVisibilityAnimationPhase(GetNativeView(), ash::ANIMATE_NONE); |
| 50 } | 52 } |
| 51 | 53 |
| 52 } // namespace chromeos | 54 } // namespace chromeos |
| OLD | NEW |