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/controls/menu/menu_scroll_view_container.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/controls/menu/menu_scroll_view_container.cc')
| -rw-r--r-- | views/controls/menu/menu_scroll_view_container.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/views/controls/menu/menu_scroll_view_container.cc b/views/controls/menu/menu_scroll_view_container.cc index 532366c..cb92284 100644 --- a/views/controls/menu/menu_scroll_view_container.cc +++ b/views/controls/menu/menu_scroll_view_container.cc @@ -257,7 +257,6 @@ void MenuScrollViewContainer::DidChangeBounds(const gfx::Rect& previous, gfx::Size content_pref = scroll_view_->GetContents()->GetPreferredSize(); scroll_up_button_->SetVisible(content_pref.height() > height()); scroll_down_button_->SetVisible(content_pref.height() > height()); - Layout(); } gfx::Size MenuScrollViewContainer::GetPreferredSize() { |