| 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 caa5331fc8511cb8f086b98ffdc11b7dca80136d..000c18f85abda3b3bee9d571b802474fcf5c0dc8 100644
|
| --- a/ui/aura_shell/default_container_layout_manager.cc
|
| +++ b/ui/aura_shell/default_container_layout_manager.cc
|
| @@ -99,9 +99,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)
|
| + if (child->type() != aura::WINDOW_TYPE_NORMAL)
|
| return;
|
|
|
| AutoReset<bool> reset(&ignore_calculate_bounds_, true);
|
| @@ -140,10 +138,7 @@ 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_)
|
| + if (child->type() != aura::WINDOW_TYPE_NORMAL || ignore_calculate_bounds_)
|
| return;
|
|
|
| // If a drag window is requesting bounds, make sure its attached to
|
|
|