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 "ash/common/wm/system_modal_container_layout_manager.h" | 5 #include "ash/common/wm/system_modal_container_layout_manager.h" |
6 | 6 |
7 #include <cmath> | 7 #include <cmath> |
8 | 8 |
9 #include "ash/common/session/session_state_delegate.h" | 9 #include "ash/common/session/session_controller.h" |
10 #include "ash/common/wm/window_dimmer.h" | 10 #include "ash/common/wm/window_dimmer.h" |
11 #include "ash/common/wm_shell.h" | 11 #include "ash/common/wm_shell.h" |
12 #include "ash/common/wm_window.h" | 12 #include "ash/common/wm_window.h" |
13 #include "ash/public/cpp/shell_window_ids.h" | 13 #include "ash/public/cpp/shell_window_ids.h" |
14 #include "base/memory/ptr_util.h" | 14 #include "base/memory/ptr_util.h" |
15 #include "base/stl_util.h" | 15 #include "base/stl_util.h" |
16 #include "ui/aura/client/aura_constants.h" | 16 #include "ui/aura/client/aura_constants.h" |
17 #include "ui/aura/window.h" | 17 #include "ui/aura/window.h" |
18 #include "ui/keyboard/keyboard_controller.h" | 18 #include "ui/keyboard/keyboard_controller.h" |
19 | 19 |
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
73 } | 73 } |
74 | 74 |
75 void SystemModalContainerLayoutManager::OnWindowAddedToLayout(WmWindow* child) { | 75 void SystemModalContainerLayoutManager::OnWindowAddedToLayout(WmWindow* child) { |
76 DCHECK(child->GetType() == ui::wm::WINDOW_TYPE_NORMAL || | 76 DCHECK(child->GetType() == ui::wm::WINDOW_TYPE_NORMAL || |
77 child->GetType() == ui::wm::WINDOW_TYPE_POPUP); | 77 child->GetType() == ui::wm::WINDOW_TYPE_POPUP); |
78 // TODO(mash): IsUserSessionBlocked() depends on knowing the login state. We | 78 // TODO(mash): IsUserSessionBlocked() depends on knowing the login state. We |
79 // need a non-stub version of SessionStateDelegate. crbug.com/648964 | 79 // need a non-stub version of SessionStateDelegate. crbug.com/648964 |
80 if (!WmShell::Get()->IsRunningInMash()) { | 80 if (!WmShell::Get()->IsRunningInMash()) { |
81 DCHECK(container_->GetShellWindowId() != | 81 DCHECK(container_->GetShellWindowId() != |
82 kShellWindowId_LockSystemModalContainer || | 82 kShellWindowId_LockSystemModalContainer || |
83 WmShell::Get()->GetSessionStateDelegate()->IsUserSessionBlocked()); | 83 WmShell::Get()->session_controller()->IsUserSessionBlocked()); |
84 } | 84 } |
85 // Since this is for SystemModal, there is no good reason to add windows | 85 // Since this is for SystemModal, there is no good reason to add windows |
86 // other than MODAL_TYPE_NONE or MODAL_TYPE_SYSTEM. DCHECK to avoid simple | 86 // other than MODAL_TYPE_NONE or MODAL_TYPE_SYSTEM. DCHECK to avoid simple |
87 // mistake. | 87 // mistake. |
88 DCHECK_NE(GetModalType(child), ui::MODAL_TYPE_CHILD); | 88 DCHECK_NE(GetModalType(child), ui::MODAL_TYPE_CHILD); |
89 DCHECK_NE(GetModalType(child), ui::MODAL_TYPE_WINDOW); | 89 DCHECK_NE(GetModalType(child), ui::MODAL_TYPE_WINDOW); |
90 | 90 |
91 child->aura_window()->AddObserver(this); | 91 child->aura_window()->AddObserver(this); |
92 if (GetModalType(child) == ui::MODAL_TYPE_SYSTEM && child->IsVisible()) | 92 if (GetModalType(child) == ui::MODAL_TYPE_SYSTEM && child->IsVisible()) |
93 AddModalWindow(child); | 93 AddModalWindow(child); |
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
271 bool SystemModalContainerLayoutManager::IsBoundsCentered( | 271 bool SystemModalContainerLayoutManager::IsBoundsCentered( |
272 const gfx::Rect& bounds) const { | 272 const gfx::Rect& bounds) const { |
273 gfx::Point window_center = bounds.CenterPoint(); | 273 gfx::Point window_center = bounds.CenterPoint(); |
274 gfx::Point container_center = GetUsableDialogArea().CenterPoint(); | 274 gfx::Point container_center = GetUsableDialogArea().CenterPoint(); |
275 return std::abs(window_center.x() - container_center.x()) < | 275 return std::abs(window_center.x() - container_center.x()) < |
276 kCenterPixelDelta && | 276 kCenterPixelDelta && |
277 std::abs(window_center.y() - container_center.y()) < kCenterPixelDelta; | 277 std::abs(window_center.y() - container_center.y()) < kCenterPixelDelta; |
278 } | 278 } |
279 | 279 |
280 } // namespace ash | 280 } // namespace ash |
OLD | NEW |