summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views/frame/browser_view2.cc
diff options
context:
space:
mode:
authorfinnur@google.com <finnur@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-05 21:36:57 +0000
committerfinnur@google.com <finnur@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-05 21:36:57 +0000
commitc2cbeb9dd8aec543d5c6f0fe2aa99c1f8c655351 (patch)
tree6f71cefde95cc33d0f656917a48df2466f8c655a /chrome/browser/views/frame/browser_view2.cc
parent970556302b1ea50d4fc680d3656269cd50f6cf08 (diff)
downloadchromium_src-c2cbeb9dd8aec543d5c6f0fe2aa99c1f8c655351.zip
chromium_src-c2cbeb9dd8aec543d5c6f0fe2aa99c1f8c655351.tar.gz
chromium_src-c2cbeb9dd8aec543d5c6f0fe2aa99c1f8c655351.tar.bz2
Readding UI test I pulled yesterday; hopefully the bots will like it more now. I need to wait for the bookmark bar to become visible so I plumbed in similar code as for the Find box instead of using Sleep's.
Review URL: http://codereview.chromium.org/473 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1809 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/frame/browser_view2.cc')
-rw-r--r--chrome/browser/views/frame/browser_view2.cc13
1 files changed, 13 insertions, 0 deletions
diff --git a/chrome/browser/views/frame/browser_view2.cc b/chrome/browser/views/frame/browser_view2.cc
index db3eedf..64c210d 100644
--- a/chrome/browser/views/frame/browser_view2.cc
+++ b/chrome/browser/views/frame/browser_view2.cc
@@ -440,6 +440,19 @@ void BrowserView2::FocusToolbar() {
void BrowserView2::DestroyBrowser() {
}
+bool BrowserView2::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;
+}
+
///////////////////////////////////////////////////////////////////////////////
// BrowserView2, NotificationObserver implementation: