diff options
| author | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-13 00:12:35 +0000 |
|---|---|---|
| committer | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-13 00:12:35 +0000 |
| commit | 1d4389b306751eba8920a2f54340a75431f8a861 (patch) | |
| tree | d67f00386f258bd73fc30636c2c0ec7567dbde29 /views/examples/single_split_view_example.h | |
| parent | 0146711d88cd3a80f802004e00198fc5ec6a1bcd (diff) | |
| download | chromium_src-1d4389b306751eba8920a2f54340a75431f8a861.zip chromium_src-1d4389b306751eba8920a2f54340a75431f8a861.tar.gz chromium_src-1d4389b306751eba8920a2f54340a75431f8a861.tar.bz2 | |
Re-land 71230.
This restores 71230 which was reverted in 71252 by sheriff (to see if it was responsible for a linux test failure -- it was not).
Original change by alekseys:
Streamline the layout of the BrowserView's children TabContents views.
Modify SingleSplitView to calculate its children view's bounds, but do not actually resize them
and change BrowserViewLayout accordingly (BrowserViewLayout resizes all views now).
Do all reserved contents rect calculations before resizing TabContents views.
Rationale: to do all BrowserView layout related actions in the context of
BrowserViewLayout::Layout call and to minimize actual contents re-layouts.
BUG=51084
TEST=All tests should pass
Review URL: http://codereview.chromium.org/5606012
Review URL: http://codereview.chromium.org/6247001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71259 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/examples/single_split_view_example.h')
| -rw-r--r-- | views/examples/single_split_view_example.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/views/examples/single_split_view_example.h b/views/examples/single_split_view_example.h index 3eaea7c..73d69a6 100644 --- a/views/examples/single_split_view_example.h +++ b/views/examples/single_split_view_example.h @@ -29,7 +29,8 @@ class SingleSplitViewExample : public ExampleBase { single_split_view_ = new views::SingleSplitView( splitted_view_1, splitted_view_2, - views::SingleSplitView::HORIZONTAL_SPLIT); + views::SingleSplitView::HORIZONTAL_SPLIT, + NULL); splitted_view_1->SetColor(SK_ColorYELLOW, SK_ColorCYAN); |