summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-02 21:40:24 +0000
committerjrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-02 21:40:24 +0000
commite1cbabf62f08b99925618c832ce41c5b6fabbbc8 (patch)
treef6a0a528c70ea89af553c8ab34473ac939609e14
parent0a357e63d5bc32ef031cc7cf9b741db9b023958b (diff)
downloadchromium_src-e1cbabf62f08b99925618c832ce41c5b6fabbbc8.zip
chromium_src-e1cbabf62f08b99925618c832ce41c5b6fabbbc8.tar.gz
chromium_src-e1cbabf62f08b99925618c832ce41c5b6fabbbc8.tar.bz2
New tab perfbot didn't like this.
Reverting to confirm this was the cause. Even if proven the cause my plan is to re-land since this fixes a visible bug but fix perf in a different way. BUG=40225 Revert 43419 - 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 TBR=jrg@chromium.org Review URL: http://codereview.chromium.org/1539017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43528 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/views/frame/browser_view_layout.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome/browser/views/frame/browser_view_layout.cc b/chrome/browser/views/frame/browser_view_layout.cc
index 562b27c..2b0f2e0 100644
--- a/chrome/browser/views/frame/browser_view_layout.cc
+++ b/chrome/browser/views/frame/browser_view_layout.cc
@@ -338,8 +338,7 @@ int BrowserViewLayout::LayoutBookmarkAndInfoBars(int top) {
int BrowserViewLayout::LayoutBookmarkBar(int top) {
DCHECK(active_bookmark_bar_);
int y = top;
- if (!browser_view_->IsBookmarkBarVisible() &&
- !active_bookmark_bar_->OnNewTabPage()) {
+ if (!browser_view_->IsBookmarkBarVisible()) {
active_bookmark_bar_->SetVisible(false);
active_bookmark_bar_->SetBounds(0, y, browser_view_->width(), 0);
return y;