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

Unified Diff: ui/aura_shell/toplevel_window_event_filter.cc

Issue 8574049: [Aura] Fix HtmlDialogBrowserTest.SizeWindow. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix bad merge Created 9 years, 1 month 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
« no previous file with comments | « ui/aura/window_delegate.h ('k') | ui/aura_shell/toplevel_window_event_filter_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura_shell/toplevel_window_event_filter.cc
diff --git a/ui/aura_shell/toplevel_window_event_filter.cc b/ui/aura_shell/toplevel_window_event_filter.cc
index e8609b424d4cf150e2538a2d8f992506ac8349df..4da437cf1248901c3b0e995a30c8f70d6acea90a 100644
--- a/ui/aura_shell/toplevel_window_event_filter.cc
+++ b/ui/aura_shell/toplevel_window_event_filter.cc
@@ -261,10 +261,7 @@ gfx::Size ToplevelWindowEventFilter::GetSizeForDrag(
(size_change_direction & kBoundsChangeDirection_Vertical ?
y_multiplier * (first_y - second_y) : 0);
- // Enforce minimum window size.
- const gfx::Size min_size = target->minimum_size();
- size.SetSize(std::max(width, min_size.width()),
- std::max(height, min_size.height()));
+ size.SetSize(width, height);
}
return size;
}
« no previous file with comments | « ui/aura/window_delegate.h ('k') | ui/aura_shell/toplevel_window_event_filter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698