Compact Navigation prototype

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

 // Copyright (c) 2011 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/ui/views/bookmarks/bookmark_bar_view.h"
 
 #include <algorithm>
 #include <limits>
 #include <set>
 #include <vector>
@@ skipping 716 matching lines @@
   return (browser_ && browser_->GetSelectedTabContents() &&
           browser_->GetSelectedTabContents()->ShouldShowBookmarkBar());
 }
 
 int BookmarkBarView::GetToolbarOverlap(bool return_max) const {
   // When not on the New Tab Page, always overlap by the full amount.
   if (return_max || !OnNewTabPage())
     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.
   return static_cast<int>(kToolbarOverlap * size_animation_->GetCurrentValue());
 }
 
 bool BookmarkBarView::is_animating() {
   return size_animation_->is_animating();
 }
 
@@ skipping 1031 matching lines @@
   // The tooltip is the only way we have to display text explaining the error
   // to the user.
   sync_error_button->SetTooltipText(
       UTF16ToWide(l10n_util::GetStringUTF16(IDS_SYNC_BOOKMARK_BAR_ERROR_DESC)));
   sync_error_button->SetAccessibleName(
       l10n_util::GetStringUTF16(IDS_ACCNAME_SYNC_ERROR_BUTTON));
   sync_error_button->SetIcon(
       *ResourceBundle::GetSharedInstance().GetBitmapNamed(IDR_WARNING));
   return sync_error_button;
 }