Compact Navigation prototype

chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc

Index: chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
index 248b76d37f53f39d369f06e5e2c3d075bac06a89..bdaf701928bb3726e07f3165ddacc6e39076fc54 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
@@ -734,8 +734,8 @@ int BookmarkBarView::GetToolbarOverlap(bool return_max) const {
     return kToolbarOverlap;
   // When on the New Tab Page with an infobar, overlap by 0 whenever the infobar
   // is above us (i.e. when we're detached), since drawing over the infobar
-  // looks weird.
-  if (IsDetached() && infobar_visible_)
+  // looks weird. If we're in compact nav mode, also overlap by zero.

[Peter Kasting, 2011/05/03 18:04:24]

Nit: This additional comment just restates the code.  Say why it is correct to
overlap by zero (or perhaps why it is wrong to do otherwise).

[SteveT, 2011/05/06 18:48:43]

Turns out this check isn't necessary anymore. It was originally to avoid
overlapping the bookmark bar too bar over the spacer, but the spacer was
eventually made large enough that it looks fine.

+  if ((IsDetached() && infobar_visible_) || browser()->UseCompactNavigationBar())

[Peter Kasting, 2011/05/03 18:04:24]

Nit: 80 columns

[SteveT, 2011/05/06 18:48:43]

Done.

[SteveT, 2011/05/06 18:48:43]

Done.

     return 0;
   // When on the New Tab Page with no infobar, animate the overlap between the
   // attached and detached states.