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();