Cleanup: Move PaintVerticalDivider() into bookmark_bar_view.cc.

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

 // Copyright (c) 2012 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 <string>
 #include <vector>
@@ skipping 402 matching lines @@
   int y;
 
   // DropData for the drop.
   BookmarkNodeData data;
 
   DropLocation location;
 };
 
 // ButtonSeparatorView  --------------------------------------------------------
 
+// Paints a themed gradient divider at location |x|. |height| is the full
+// height of the view you want to paint the divider into, not the height of
+// the divider. The height of the divider will become:
+//   |height| - 2 * |vertical_padding|.
+// The color of the divider is a gradient starting with |top_color| at the
+// top, and changing into |middle_color| and then over to |bottom_color| as
+// you go further down.
+void PaintVerticalDivider(gfx::Canvas* canvas,
+                          int x,
+                          int height,
+                          int vertical_padding,
+                          SkColor top_color,
+                          SkColor middle_color,
+                          SkColor bottom_color) {
+  // Draw the upper half of the divider.
+  SkPaint paint;
+  skia::RefPtr<SkShader> shader = gfx::CreateGradientShader(
+      vertical_padding + 1, height / 2, top_color, middle_color);
+  paint.setShader(shader.get());
+  SkRect rc = { SkIntToScalar(x),
+                SkIntToScalar(vertical_padding + 1),
+                SkIntToScalar(x + 1),
+                SkIntToScalar(height / 2) };
+  canvas->sk_canvas()->drawRect(rc, paint);
+
+  // Draw the lower half of the divider.
+  SkPaint paint_down;
+  shader = gfx::CreateGradientShader(
+      height / 2, height - vertical_padding, middle_color, bottom_color);
+  paint_down.setShader(shader.get());
+  SkRect rc_down = { SkIntToScalar(x),
+                     SkIntToScalar(height / 2),
+                     SkIntToScalar(x + 1),
+                     SkIntToScalar(height - vertical_padding) };
+  canvas->sk_canvas()->drawRect(rc_down, paint_down);
+}
+
 class BookmarkBarView::ButtonSeparatorView : public views::View {
  public:
   ButtonSeparatorView() {}
   ~ButtonSeparatorView() override {}
 
   void OnPaint(gfx::Canvas* canvas) override {
-    DetachableToolbarView::PaintVerticalDivider(
+    PaintVerticalDivider(
         canvas,
         kSeparatorStartX,
         height(),
         1,
         kEdgeDividerColor,
         kMiddleDividerColor,
         GetThemeProvider()->GetColor(ThemeProperties::COLOR_TOOLBAR));
   }
 
   gfx::Size GetPreferredSize() const override {
@@ skipping 1520 matching lines @@
     return;
   apps_page_shortcut_->SetVisible(visible);
   UpdateBookmarksSeparatorVisibility();
   LayoutAndPaint();
 }
 
 void BookmarkBarView::OnShowManagedBookmarksPrefChanged() {
   if (UpdateOtherAndManagedButtonsVisibility())
     LayoutAndPaint();
 }