| 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 "ash/shell.h" | 5 #include "ash/shell.h" |
| 6 #include "ash/shell_window_ids.h" | 6 #include "ash/shell_window_ids.h" |
| 7 #include "ash/shell/example_factory.h" | 7 #include "ash/shell/example_factory.h" |
| 8 #include "ash/tooltips/tooltip_controller.h" |
| 8 #include "base/utf_string_conversions.h" | 9 #include "base/utf_string_conversions.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 #include "ui/gfx/canvas.h" | 12 #include "ui/gfx/canvas.h" |
| 12 #include "ui/gfx/font.h" | 13 #include "ui/gfx/font.h" |
| 13 #include "ui/views/widget/widget.h" | 14 #include "ui/views/widget/widget.h" |
| 14 #include "ui/views/widget/widget_delegate.h" | 15 #include "ui/views/widget/widget_delegate.h" |
| 15 | 16 |
| 16 using ash::Shell; | 17 using ash::Shell; |
| 17 | 18 |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 61 (root_window_size.height() - ps.height()) / 2, | 62 (root_window_size.height() - ps.height()) / 2, |
| 62 ps.width(), ps.height()); | 63 ps.width(), ps.height()); |
| 63 params.delegate = lock_view; | 64 params.delegate = lock_view; |
| 64 widget->Init(params); | 65 widget->Init(params); |
| 65 Shell::GetInstance()->GetContainer( | 66 Shell::GetInstance()->GetContainer( |
| 66 ash::internal::kShellWindowId_LockScreenContainer)-> | 67 ash::internal::kShellWindowId_LockScreenContainer)-> |
| 67 AddChild(widget->GetNativeView()); | 68 AddChild(widget->GetNativeView()); |
| 68 widget->SetContentsView(lock_view); | 69 widget->SetContentsView(lock_view); |
| 69 widget->Show(); | 70 widget->Show(); |
| 70 widget->GetNativeView()->SetName("LockView"); | 71 widget->GetNativeView()->SetName("LockView"); |
| 72 |
| 73 Shell::GetInstance()->tooltip_controller()->UpdateTooltip( |
| 74 widget->GetNativeView()); |
| 71 } | 75 } |
| 72 | 76 |
| 73 } // namespace shell | 77 } // namespace shell |
| 74 } // namespace ash | 78 } // namespace ash |
| OLD | NEW |