alternate ntp: tweaks and fixes for bookmark bar in ntp

chrome/browser/ui/views/detachable_toolbar_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/detachable_toolbar_view.h"
 
 #include "chrome/browser/themes/theme_service.h"
 #include "grit/theme_resources.h"
 #include "third_party/skia/include/core/SkShader.h"
 #include "ui/base/resource/resource_bundle.h"
@@ skipping 47 matching lines @@
            SkDoubleToScalar(vertical_padding - 0.5),
            SkDoubleToScalar(view->width() - horizontal_padding - 0.5),
            SkDoubleToScalar(view->height() - vertical_padding - 0.5));
 
   *roundness = static_cast<double>(kNewtabBarRoundness) * animation_state;
 }
 
 // static
 void DetachableToolbarView::PaintHorizontalBorder(gfx::Canvas* canvas,
                                                   DetachableToolbarView* view) {
+  PaintHorizontalBorderWithColor(canvas, view,
+      ThemeService::GetDefaultColor(ThemeService::COLOR_TOOLBAR_SEPARATOR));
+}
+
+// static
+void DetachableToolbarView::PaintHorizontalBorderWithColor(
+    gfx::Canvas* canvas,
+    DetachableToolbarView* view,
+    SkColor border_color) {
   // Border can be at the top or at the bottom of the view depending on whether
   // the view (bar/shelf) is attached or detached.
   int thickness = views::NonClientFrameView::kClientEdgeThickness;
   int y = view->IsDetached() ? 0 : (view->height() - thickness);
-  canvas->FillRect(gfx::Rect(0, y, view->width(), thickness),
-      ThemeService::GetDefaultColor(ThemeService::COLOR_TOOLBAR_SEPARATOR));
+  canvas->FillRect(gfx::Rect(0, y, view->width(), thickness), border_color);
 }
 
 // static
 void DetachableToolbarView::PaintContentAreaBackground(
     gfx::Canvas* canvas,
     ui::ThemeProvider* theme_provider,
     const SkRect& rect,
     double roundness) {
   SkPaint paint;
   paint.setAntiAlias(true);
@@ skipping 42 matching lines @@
   // Draw the lower half of the divider.
   SkPaint paint_down;
   SkSafeUnref(paint_down.setShader(gfx::CreateGradientShader(
           height / 2, height - vertical_padding, middle_color, bottom_color)));
   SkRect rc_down = { SkIntToScalar(x),
                      SkIntToScalar(height / 2),
                      SkIntToScalar(x + 1),
                      SkIntToScalar(height - vertical_padding) };
   canvas->sk_canvas()->drawRect(rc_down, paint_down);
 }