diff options
| author | erikkay@chromium.org <erikkay@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-13 17:44:47 +0000 |
|---|---|---|
| committer | erikkay@chromium.org <erikkay@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-13 17:44:47 +0000 |
| commit | ef9f58b81bdfe5bda9621236f18e62fe56116dbb (patch) | |
| tree | 1121c31d0736c37641c58aac296f0adb6f2cd254 /chrome/browser | |
| parent | bbf94a3e7f3c4372c4ff918a6811a505d8fd69b9 (diff) | |
| download | chromium_src-ef9f58b81bdfe5bda9621236f18e62fe56116dbb.zip chromium_src-ef9f58b81bdfe5bda9621236f18e62fe56116dbb.tar.gz chromium_src-ef9f58b81bdfe5bda9621236f18e62fe56116dbb.tar.bz2 | |
fix NTP layout
BUG=56510
TEST=hide and close the bookmarks bar on the NTP and note the logo in the lower right corner stays visible
Review URL: http://codereview.chromium.org/3730005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62421 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/views/frame/browser_view.cc | 28 | ||||
| -rw-r--r-- | chrome/browser/views/frame/browser_view_layout.cc | 1 |
2 files changed, 13 insertions, 16 deletions
diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc index b0f183a..318a3a93 100644 --- a/chrome/browser/views/frame/browser_view.cc +++ b/chrome/browser/views/frame/browser_view.cc @@ -1773,23 +1773,21 @@ std::string BrowserView::GetClassName() const { void BrowserView::Layout() { if (ignore_layout_) return; - if (GetLayoutManager()) { - GetLayoutManager()->Layout(this); - SchedulePaint(); + views::View::Layout(); + #if defined(OS_WIN) - // Send the margins of the "user-perceived content area" of this - // browser window so AeroPeekManager can render a background-tab image in - // the area. - // TODO(pkasting) correct content inset?? - if (aeropeek_manager_.get()) { - gfx::Insets insets(GetFindBarBoundingBox().y() + 1, - 0, - 0, - 0); - aeropeek_manager_->SetContentInsets(insets); - } -#endif + // Send the margins of the "user-perceived content area" of this + // browser window so AeroPeekManager can render a background-tab image in + // the area. + // TODO(pkasting) correct content inset?? + if (aeropeek_manager_.get()) { + gfx::Insets insets(GetFindBarBoundingBox().y() + 1, + 0, + 0, + 0); + aeropeek_manager_->SetContentInsets(insets); } +#endif } void BrowserView::ViewHierarchyChanged(bool is_add, diff --git a/chrome/browser/views/frame/browser_view_layout.cc b/chrome/browser/views/frame/browser_view_layout.cc index 7167dad..f6c1ff6 100644 --- a/chrome/browser/views/frame/browser_view_layout.cc +++ b/chrome/browser/views/frame/browser_view_layout.cc @@ -253,7 +253,6 @@ void BrowserViewLayout::Layout(views::View* host) { int bottom = LayoutDownloadShelf(browser_view_->height()); int active_top_margin = GetTopMarginForActiveContent(); top -= active_top_margin; - bottom += active_top_margin; contents_container_->SetActiveTopMargin(active_top_margin); LayoutTabContents(top, bottom); // This must be done _after_ we lay out the TabContents since this |