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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: views/widget/widget.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 | « views/widget/widget.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/widget/widget.cc
diff --git a/views/widget/widget.cc b/views/widget/widget.cc
index 1ab394f1f5bc4965aa7142f0dde775653643fff0..a3973c5c4cdae8ad3033751ac991a75cf1d92096 100644
--- a/views/widget/widget.cc
+++ b/views/widget/widget.cc
@@ -166,7 +166,6 @@ Widget::Widget()
disable_inactive_rendering_(false),
widget_closed_(false),
saved_show_state_(ui::SHOW_STATE_DEFAULT),
- minimum_size_(100, 100),
focus_on_creation_(true),
is_top_level_(false),
native_widget_initialized_(false),
@@ -918,7 +917,7 @@ void Widget::OnNativeWidgetDestroyed() {
}
gfx::Size Widget::GetMinimumSize() {
- return non_client_view_ ? non_client_view_->GetMinimumSize() : minimum_size_;
+ return non_client_view_ ? non_client_view_->GetMinimumSize() : gfx::Size();
}
void Widget::OnNativeWidgetSizeChanged(const gfx::Size& new_size) {
« no previous file with comments | « views/widget/widget.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698