Re-land r51526

views/view.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "views/view.h"
 
 #include <algorithm>
 #ifndef NDEBUG
 #include <iostream>
 #endif
@@ skipping 200 matching lines @@
   }
 }
 
 /////////////////////////////////////////////////////////////////////////////
 //
 // View - layout
 //
 /////////////////////////////////////////////////////////////////////////////
 
 void View::Layout() {
-  // Layout child Views
+  // If we have a layout manager, let it handle the layout for us.
   if (layout_manager_.get()) {
     layout_manager_->Layout(this);
     SchedulePaint();
-    // 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).
+    return;
   }
 
-  // Lay out contents of child Views
+  // Otherwise, just pass on to the child views.
   for (int i = 0, count = GetChildViewCount(); i < count; ++i) {
     View* child = GetChildViewAt(i);
     child->Layout();
   }
 }
 
 LayoutManager* View::GetLayoutManager() const {
   return layout_manager_.get();
 }
 
@@ skipping 1266 matching lines @@
   possible_drag = false;
   start_pt = gfx::Point();
 }
 
 void View::DragInfo::PossibleDrag(const gfx::Point& p) {
   possible_drag = true;
   start_pt = p;
 }
 
 }  // namespace