Readding UI test I pulled yesterday; hopefully the bots will like it more now...

chrome/browser/xp_frame.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/xp_frame.h"
 
 #include <windows.h>
 
 #include "base/command_line.h"
 #include "base/gfx/native_theme.h"
@@ skipping 1872 matching lines @@
 }
 
 void XPFrame::ProfileChanged(Profile* profile) {
   browser_view_->ProfileChanged(profile);
 }
 
 void XPFrame::FocusToolbar() {
   browser_view_->FocusToolbar();
 }
 
+bool XPFrame::IsBookmarkBarVisible() const {
+  if (!bookmark_bar_view_.get())
+    return false;
+
+  if (bookmark_bar_view_->IsNewTabPage() || bookmark_bar_view_->IsAnimating())
+    return true;
+
+  CSize sz;
+  bookmark_bar_view_->GetPreferredSize(&sz);
+  // 1 is the minimum in GetPreferredSize for the bookmark bar.
+  return sz.cy > 1;
+}
+
 void XPFrame::MoveToFront(bool should_activate) {
   int flags = SWP_NOMOVE | SWP_NOSIZE;
   if (!should_activate) {
     flags |= SWP_NOACTIVATE;
   }
   SetWindowPos(HWND_TOP, 0, 0, 0, 0, flags);
   SetForegroundWindow(*this);
 }
 
 HWND XPFrame::GetHWND() const {
@@ skipping 587 matching lines @@
 
   // Only do a layout if the current contents is non-null. We assume that if the
   // contents is NULL, we're either being destroyed, or ShowTabContents is going
   // to be invoked with a non-null TabContents again so that there is no need
   // in doing a layout now (and would result in extra work/invalidation on
   // tab switches).
   if (changed && current_tab)
     Layout();
 }