diff options
| author | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-02 00:39:32 +0000 |
|---|---|---|
| committer | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-02 00:39:32 +0000 |
| commit | fafa55e4008334d46aaa744b7064247bf60b2fb6 (patch) | |
| tree | eeb2691188d4184072aff629d13753f0ad9dd849 | |
| parent | 9d4f882ccbb25623d8c404e75d34e07b2b52ec5f (diff) | |
| download | chromium_src-fafa55e4008334d46aaa744b7064247bf60b2fb6.zip chromium_src-fafa55e4008334d46aaa744b7064247bf60b2fb6.tar.gz chromium_src-fafa55e4008334d46aaa744b7064247bf60b2fb6.tar.bz2 | |
Fix floating bookmark bar on windows.
IsBookmarkBarVisible() continues to have a consistent meaning across
platforms, but extra logic has been added to windows to be smarter
about when to show the bar. Such extra logic also is consistent
across platforms (e.g. see browser_window_gtk.cc and
bookmark_bar_gtk.cc).
Problem introduced with http://codereview.chromium.org/1461001
BUG=http://crbug.com/39559
Review URL: http://codereview.chromium.org/1594009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43419 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/views/frame/browser_view_layout.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/views/frame/browser_view_layout.cc b/chrome/browser/views/frame/browser_view_layout.cc index 2b0f2e0..562b27c 100644 --- a/chrome/browser/views/frame/browser_view_layout.cc +++ b/chrome/browser/views/frame/browser_view_layout.cc @@ -338,7 +338,8 @@ int BrowserViewLayout::LayoutBookmarkAndInfoBars(int top) { int BrowserViewLayout::LayoutBookmarkBar(int top) { DCHECK(active_bookmark_bar_); int y = top; - if (!browser_view_->IsBookmarkBarVisible()) { + if (!browser_view_->IsBookmarkBarVisible() && + !active_bookmark_bar_->OnNewTabPage()) { active_bookmark_bar_->SetVisible(false); active_bookmark_bar_->SetBounds(0, y, browser_view_->width(), 0); return y; |