summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorfinnur@google.com <finnur@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-24 21:47:36 +0000
committerfinnur@google.com <finnur@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-24 21:47:36 +0000
commitd5c4f386029ab19cec0f4d76bede0c4d2975d431 (patch)
treeeeb0244090d28e0617bc7698d061a572f089ec3a /chrome
parenta0368962ba3abe9c18d44395d0d224f087db2423 (diff)
downloadchromium_src-d5c4f386029ab19cec0f4d76bede0c4d2975d431.zip
chromium_src-d5c4f386029ab19cec0f4d76bede0c4d2975d431.tar.gz
chromium_src-d5c4f386029ab19cec0f4d76bede0c4d2975d431.tar.bz2
Fixing 8010: Missing options from Options dlg.
This should also fix the hang in the interactive_ui_tests. The problem is in a one line change in view.cc where we return early from a Layout call. BUG=8010 Review URL: http://codereview.chromium.org/27102 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10294 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/views/view.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/views/view.cc b/chrome/views/view.cc
index c61cbbd..c7bb123 100644
--- a/chrome/views/view.cc
+++ b/chrome/views/view.cc
@@ -206,7 +206,10 @@ void View::Layout() {
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).
}
// Lay out contents of child Views