summaryrefslogtreecommitdiffstats
path: root/views/grid_layout.h
diff options
context:
space:
mode:
authormnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-02 13:46:43 +0000
committermnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-02 13:46:43 +0000
commit552d67df8c38db1a7097ef1af632d8b36459df81 (patch)
tree364a305dabf4cb25dc37d2c5fc8eb7ee241b4d71 /views/grid_layout.h
parentaa43b4d1623f3480929e8e5d659702a3eaacb769 (diff)
downloadchromium_src-552d67df8c38db1a7097ef1af632d8b36459df81.zip
chromium_src-552d67df8c38db1a7097ef1af632d8b36459df81.tar.gz
chromium_src-552d67df8c38db1a7097ef1af632d8b36459df81.tar.bz2
Auto-size the views version of the options dialog.
This adds support for auto-sizing tab controls, adjusts the options dialog to use it and takes care of any fallout due to the new layout handling. Also fixes a couple of small bugs in the views Layout() machinery and sanitizes layouting of options pages. BUG=36497 TEST=unit tests in tabbed_pane_unittest.cc and grid_layout_unittest.cc, as well as checking the options dialog in any supported language. Review URL: http://codereview.chromium.org/2812026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51526 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/grid_layout.h')
-rw-r--r--views/grid_layout.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/views/grid_layout.h b/views/grid_layout.h
index 6d6c61c..bb882ad 100644
--- a/views/grid_layout.h
+++ b/views/grid_layout.h
@@ -183,8 +183,7 @@ 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.