diff options
| author | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-02 14:55:09 +0000 |
|---|---|---|
| committer | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-02 14:55:09 +0000 |
| commit | d2f7d56bd62cd8d6a8e50b25dac8f2bc4871eafe (patch) | |
| tree | e66610ffde53c34e58f671b92092b69e714268f2 /views/view.cc | |
| parent | fbde2f7efff4198e4138e1f202395dacc1847da6 (diff) | |
| download | chromium_src-d2f7d56bd62cd8d6a8e50b25dac8f2bc4871eafe.zip chromium_src-d2f7d56bd62cd8d6a8e50b25dac8f2bc4871eafe.tar.gz chromium_src-d2f7d56bd62cd8d6a8e50b25dac8f2bc4871eafe.tar.bz2 | |
Revert r51526 (Auto-size the views version of the options dialog.)
Unexpected unit_tests crash on chromeos.
TBR: mnissler
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51529 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/view.cc')
| -rw-r--r-- | views/view.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/views/view.cc b/views/view.cc index 22b048b..90fb2bc 100644 --- a/views/view.cc +++ b/views/view.cc @@ -218,14 +218,17 @@ void View::ScrollRectToVisible(const gfx::Rect& rect) { ///////////////////////////////////////////////////////////////////////////// void View::Layout() { - // If we have a layout manager, let it handle the layout for us. + // Layout child Views if (layout_manager_.get()) { layout_manager_->Layout(this); SchedulePaint(); - return; + // TODO(beng): We believe the right thing to do here is return since the + // layout manager should be handling things, but it causes + // regressions (missing options from Options dialog and a hang + // in interactive_ui_tests). } - // Otherwise, just pass on to the child views. + // Lay out contents of child Views for (int i = 0, count = GetChildViewCount(); i < count; ++i) { View* child = GetChildViewAt(i); child->Layout(); |