Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(161)

Unified Diff: ui/aura_shell/default_container_layout_manager.cc

Issue 8414035: Makes DefaultContainerLayoutManager ignore windows with transient (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add test Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 98d3dc31bd0eddcb7dd6756d7ac40c3bee292c0e..5fd34bdfeb552596d9ec802fbf9c19988a172e6b 100644
--- a/ui/aura_shell/default_container_layout_manager.cc
+++ b/ui/aura_shell/default_container_layout_manager.cc
@@ -102,7 +102,8 @@ 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 (type != views::Widget::InitParams::TYPE_WINDOW ||
+ child->transient_parent())
return;
AutoReset<bool> reset(&ignore_calculate_bounds_, true);
@@ -144,7 +145,7 @@ void DefaultContainerLayoutManager::CalculateBoundsForChild(
intptr_t type = reinterpret_cast<intptr_t>(
ui::ViewProp::GetValue(child, views::NativeWidgetAura::kWindowTypeKey));
if (type != views::Widget::InitParams::TYPE_WINDOW ||
- ignore_calculate_bounds_)
+ ignore_calculate_bounds_ || child->transient_parent())
return;
// If a drag window is requesting bounds, make sure its attached to

Powered by Google App Engine
This is Rietveld 408576698