| Index: ui/aura_shell/default_container_layout_manager.cc
|
| diff --git a/ui/aura_shell/default_container_layout_manager.cc b/ui/aura_shell/default_container_layout_manager.cc
|
| index 5fd34bdfeb552596d9ec802fbf9c19988a172e6b..11a6b1b631e69a6204ab4aa4b2aed39fba9a3bc7 100644
|
| --- a/ui/aura_shell/default_container_layout_manager.cc
|
| +++ b/ui/aura_shell/default_container_layout_manager.cc
|
| @@ -100,10 +100,7 @@ void DefaultContainerLayoutManager::OnWindowResized() {
|
| }
|
|
|
| void DefaultContainerLayoutManager::OnWindowAdded(aura::Window* child) {
|
| - intptr_t type = reinterpret_cast<intptr_t>(
|
| - ui::ViewProp::GetValue(child, views::NativeWidgetAura::kWindowTypeKey));
|
| - if (type != views::Widget::InitParams::TYPE_WINDOW ||
|
| - child->transient_parent())
|
| + if (child->type() != aura::WINDOW_TYPE_NORMAL || child->transient_parent())
|
| return;
|
|
|
| AutoReset<bool> reset(&ignore_calculate_bounds_, true);
|
| @@ -142,10 +139,9 @@ void DefaultContainerLayoutManager::OnChildWindowVisibilityChanged(
|
| void DefaultContainerLayoutManager::CalculateBoundsForChild(
|
| aura::Window* child,
|
| gfx::Rect* requested_bounds) {
|
| - intptr_t type = reinterpret_cast<intptr_t>(
|
| - ui::ViewProp::GetValue(child, views::NativeWidgetAura::kWindowTypeKey));
|
| - if (type != views::Widget::InitParams::TYPE_WINDOW ||
|
| - ignore_calculate_bounds_ || child->transient_parent())
|
| + if (child->type() != aura::WINDOW_TYPE_NORMAL ||
|
| + ignore_calculate_bounds_ ||
|
| + child->transient_parent())
|
| return;
|
|
|
| // If a drag window is requesting bounds, make sure its attached to
|
|
|