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/grid_layout.h | |
| 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/grid_layout.h')
| -rw-r--r-- | views/grid_layout.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/views/grid_layout.h b/views/grid_layout.h index bb882ad..6d6c61c 100644 --- a/views/grid_layout.h +++ b/views/grid_layout.h @@ -183,7 +183,8 @@ class GridLayout : public LayoutManager { // they both call into this method. This sizes the Columns/Rows as // appropriate. If layout is true, width/height give the width/height the // of the host, otherwise they are ignored. - void SizeRowsAndColumns(bool layout, int width, int height, gfx::Size* pref); + void SizeRowsAndColumns(bool layout, int width, int height, + gfx::Size* pref); // Calculates the master columns of all the column sets. See Column for // a description of what a master column is. |