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

Unified Diff: ui/aura/window.cc

Issue 2548513002: Update bool WindowManager::OnWmSetBounds() to match with its desirable behavior. (Closed)
Patch Set: Remove if condition statetment in Window::SetBounds(const gfx::Rect& new_bounds). Created 4 years 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
« ui/aura/mus/window_tree_client.cc ('K') | « ui/aura/test/aura_test_base.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/window.cc
diff --git a/ui/aura/window.cc b/ui/aura/window.cc
index cd4debe82cbc0b6043efc244e7d9852e3d86aace..ede3831c4b83869d38b696d45d46de0246136bb8 100644
--- a/ui/aura/window.cc
+++ b/ui/aura/window.cc
@@ -293,19 +293,15 @@ std::unique_ptr<ui::EventTargeter> Window::SetEventTargeter(
}
void Window::SetBounds(const gfx::Rect& new_bounds) {
- if (parent_ && parent_->layout_manager())
mfomitchev 2016/12/08 20:44:23 Please put this back
- parent_->layout_manager()->SetChildBounds(this, new_bounds);
- else {
- // Ensure we don't go smaller than our minimum bounds.
- gfx::Rect final_bounds(new_bounds);
- if (delegate_) {
- const gfx::Size& min_size = delegate_->GetMinimumSize();
- final_bounds.set_width(std::max(min_size.width(), final_bounds.width()));
- final_bounds.set_height(std::max(min_size.height(),
- final_bounds.height()));
- }
- SetBoundsInternal(final_bounds);
+ // Ensure we don't go smaller than our minimum bounds.
+ gfx::Rect final_bounds(new_bounds);
+ if (delegate_) {
+ const gfx::Size& min_size = delegate_->GetMinimumSize();
+ final_bounds.set_width(std::max(min_size.width(), final_bounds.width()));
+ final_bounds.set_height(std::max(min_size.height(),
+ final_bounds.height()));
}
+ SetBoundsInternal(final_bounds);
}
void Window::SetBoundsInScreen(const gfx::Rect& new_bounds_in_screen,
« ui/aura/mus/window_tree_client.cc ('K') | « ui/aura/test/aura_test_base.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698