diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-02 19:18:23 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-02 19:18:23 +0000 |
| commit | 33abcf5b83f6e9dcdfc5b1176c32b382e7812751 (patch) | |
| tree | 59d9028a8ccda4cc738863d688cf8f15e37b7c45 /chrome/browser | |
| parent | 0defe4ccf81bab5943943ddbbd49c75e96fd1c61 (diff) | |
| download | chromium_src-33abcf5b83f6e9dcdfc5b1176c32b382e7812751.zip chromium_src-33abcf5b83f6e9dcdfc5b1176c32b382e7812751.tar.gz chromium_src-33abcf5b83f6e9dcdfc5b1176c32b382e7812751.tar.bz2 | |
Fixes bug where toggling side tabs wouldn't do a Layout. This was a
result of recent changes to View::Layout
BUG=chromium-os:4637
TEST=see bug
Review URL: http://codereview.chromium.org/3056017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54581 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/views/frame/browser_frame_gtk.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/views/frame/browser_frame_win.cc | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/chrome/browser/views/frame/browser_frame_gtk.cc b/chrome/browser/views/frame/browser_frame_gtk.cc index a1302ee..674ec31 100644 --- a/chrome/browser/views/frame/browser_frame_gtk.cc +++ b/chrome/browser/views/frame/browser_frame_gtk.cc @@ -132,6 +132,10 @@ views::View* BrowserFrameGtk::GetFrameView() const { } void BrowserFrameGtk::TabStripDisplayModeChanged() { + if (GetRootView()->GetChildViewCount() > 0) { + // Make sure the child of the root view gets Layout again. + GetRootView()->GetChildViewAt(0)->InvalidateLayout(); + } GetRootView()->Layout(); } diff --git a/chrome/browser/views/frame/browser_frame_win.cc b/chrome/browser/views/frame/browser_frame_win.cc index 80f8074..5c77c2c 100644 --- a/chrome/browser/views/frame/browser_frame_win.cc +++ b/chrome/browser/views/frame/browser_frame_win.cc @@ -135,9 +135,13 @@ views::View* BrowserFrameWin::GetFrameView() const { } void BrowserFrameWin::TabStripDisplayModeChanged() { + if (GetRootView()->GetChildViewCount() > 0) { + // Make sure the child of the root view gets Layout again. + GetRootView()->GetChildViewAt(0)->InvalidateLayout(); + } GetRootView()->Layout(); + UpdateDWMFrame(); - GetRootView()->Layout(); } /////////////////////////////////////////////////////////////////////////////// |