ExtensionShelf now uses the BookmarkExtensionBackground, just like the Bookma...

chrome/browser/views/bookmark_bar_view.cc

 // Copyright (c) 2009 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/views/bookmark_bar_view.h"
 
 #include <limits>
 
 #include "app/gfx/canvas.h"
 #include "app/gfx/text_elider.h"
@@ skipping 62 matching lines @@
 
 // Icon to display when one isn't found for the page.
 static SkBitmap* kDefaultFavIcon = NULL;
 
 // Icon used for folders.
 static SkBitmap* kFolderIcon = NULL;
 
 // Border colors for the BookmarBarView.
 static const SkColor kTopBorderColor = SkColorSetRGB(222, 234, 248);
 
-// How round the 'new tab' style bookmarks bar is.
-static const int kNewtabBarRoundness = 5;
-
 // Offset for where the menu is shown relative to the bottom of the
 // BookmarkBarView.
 static const int kMenuOffset = 3;
 
 // Delay during drag and drop before the menu pops up. This is only used if
 // we can't get the value from the OS.
 static const int kShowFolderDropMenuDelay = 400;
 
 // Color of the drop indicator.
 static const SkColor kDropIndicatorColor = SK_ColorBLACK;
@@ skipping 194 matching lines @@
 };
 
 // ButtonSeparatorView  --------------------------------------------------------
 
 class BookmarkBarView::ButtonSeparatorView : public views::View {
  public:
   ButtonSeparatorView() {}
   virtual ~ButtonSeparatorView() {}
 
   virtual void Paint(gfx::Canvas* canvas) {
-    SkPaint paint;
-    paint.setShader(skia::CreateGradientShader(0,
-                                               height() / 2,
-                                               kTopBorderColor,
-                                               kSeparatorColor))->safeUnref();
-    SkRect rc = {SkIntToScalar(kSeparatorStartX),  SkIntToScalar(0),
-                 SkIntToScalar(1), SkIntToScalar(height() / 2) };
-    canvas->drawRect(rc, paint);
-
-    SkPaint paint_down;
-    paint_down.setShader(skia::CreateGradientShader(height() / 2,
-        height(),
+    DetachableToolbarView::PaintVerticalDivider(
+        canvas, kSeparatorStartX, height(), 1, kTopBorderColor,
         kSeparatorColor,
-        GetThemeProvider()->GetColor(BrowserThemeProvider::COLOR_TOOLBAR)
-        ))->safeUnref();
-    SkRect rc_down = {
-        SkIntToScalar(kSeparatorStartX),  SkIntToScalar(height() / 2),
-        SkIntToScalar(1), SkIntToScalar(height() - 1) };
-    canvas->drawRect(rc_down, paint_down);
+        GetThemeProvider()->GetColor(BrowserThemeProvider::COLOR_TOOLBAR));
   }
 
   virtual gfx::Size GetPreferredSize() {
     // We get the full height of the bookmark bar, so that the height returned
     // here doesn't matter.
     return gfx::Size(kSeparatorWidth, 1);
   }
 
   virtual bool GetAccessibleName(std::wstring* name) {
     DCHECK(name);
@@ skipping 400 matching lines @@
 }
 
 #ifdef CHROME_PERSONALIZATION
 void BookmarkBarView::OnStateChanged() {
   // When the sync state changes, it is sufficient to invoke View::Layout since
   // during layout we query the profile sync service and determine whether the
   // new state requires showing the sync error button so that the user can
   // re-enter her password. If extension shelf appears along with the bookmark
   // shelf, it too needs to be layed out. Since both have the same parent, it is
   // enough to let the parent layout both of these children.
-  // TODO (sky): This should not require Layout() and SchedulePaint(). Needs
-  //             some cleanup.
+  // TODO(sky): This should not require Layout() and SchedulePaint(). Needs
+  //            some cleanup.
   PreferredSizeChanged();
   Layout();
   SchedulePaint();
 }
 #endif
 
 void BookmarkBarView::OnFullscreenToggled(bool fullscreen) {
   if (!fullscreen)
     size_animation_->Reset(IsAlwaysShown() ? 1 : 0);
   else if (IsAlwaysShown())
     size_animation_->Reset(0);
 }
 
-bool BookmarkBarView::IsDetachedStyle() {
+bool BookmarkBarView::IsDetached() const {
   return OnNewTabPage() && (size_animation_->GetCurrentValue() != 1);
 }
 
-bool BookmarkBarView::IsAlwaysShown() {
+bool BookmarkBarView::IsOnTop() const {
+  return true;
+}
+
+bool BookmarkBarView::IsAlwaysShown() const {
   return profile_->GetPrefs()->GetBoolean(prefs::kShowBookmarkBar);
 }
 
-bool BookmarkBarView::OnNewTabPage() {
+bool BookmarkBarView::OnNewTabPage() const {
   return (browser_ && browser_->GetSelectedTabContents() &&
           browser_->GetSelectedTabContents()->IsBookmarkBarAlwaysVisible());
 }
 
 int BookmarkBarView::GetToolbarOverlap(bool return_max) {
   return static_cast<int>(kToolbarOverlap *
       (return_max ? 1.0 : size_animation_->GetCurrentValue()));
 }
 
 void BookmarkBarView::AnimationProgressed(const Animation* animation) {
@@ skipping 310 matching lines @@
                               gfx::NativeView hwnd) {
   const BookmarkNode* node;
   MenuItemView::AnchorPosition anchor_point = MenuItemView::TOPLEFT;
 
   // When we set the menu's position, we must take into account the mirrored
   // position of the View relative to its parent. This can be easily done by
   // passing the right flag to View::x().
   int x = view->GetX(APPLY_MIRRORING_TRANSFORMATION);
   int bar_height = height() - kMenuOffset;
 
-  if (IsDetachedStyle())
+  if (IsDetached())
     bar_height -= kNewtabVerticalPadding;
 
   int start_index = 0;
   if (view == other_bookmarked_button_) {
     UserMetrics::RecordAction(L"BookmarkBar_ShowOtherBookmarks", profile_);
 
     node = model_->other_node();
     if (UILayoutIsRightToLeft())
       anchor_point = MenuItemView::TOPLEFT;
     else
@@ skipping 574 matching lines @@
                                         height);
   }
   x += other_bookmarked_pref.width() + kButtonPadding;
 
 #ifdef CHROME_PERSONALIZATION
   // Set the real bounds of the sync error button only if it needs to appear on
   // the bookmarks bar.
   if (should_show_sync_error_button) {
     x += kButtonPadding;
     if (!compute_bounds_only) {
-      sync_error_button_->SetBounds(x, y, sync_error_button_pref.width(), height);
+      sync_error_button_->SetBounds(
+          x, y, sync_error_button_pref.width(), height);
       sync_error_button_->SetVisible(true);
     }
     x += sync_error_button_pref.width();
   } else if (!compute_bounds_only) {
     sync_error_button_->SetBounds(x, y, 0, height);
     sync_error_button_->SetVisible(false);
   }
 #endif
 
   // Set the preferred size computed so far.
@@ skipping 43 matching lines @@
   sync_error_button->SetTooltipText(
       l10n_util::GetString(IDS_SYNC_BOOKMARK_BAR_ERROR_DESC));
   sync_error_button->SetAccessibleName(
       l10n_util::GetString(IDS_ACCNAME_SYNC_ERROR_BUTTON));
   sync_error_button->SetIcon(
       *ResourceBundle::GetSharedInstance().GetBitmapNamed(IDR_WARNING));
   return sync_error_button;
 }
 #endif