Minor fixes to BubbleBorder2 and LauncherTooltipManager:

ui/views/bubble/bubble_border_2.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 "ui/views/bubble/bubble_border_2.h"
 
 #include <algorithm>  // for std::max
 
 #include "base/logging.h"
 #include "ui/gfx/canvas.h"
@@ skipping 174 matching lines @@
              arrow_height_,
              arrow_width_);
 }
 
 void BubbleBorder2::SetShadow(gfx::ShadowValue shadow) {
   shadows_.clear();
   shadows_.push_back(shadow);
 }
 
 int BubbleBorder2::GetBorderThickness() const {
-  return 0;
+  return border_size_;
 }
 
 void BubbleBorder2::PaintBackground(gfx::Canvas* canvas,
                                     const gfx::Rect& bounds) const {
   canvas->FillRect(bounds, background_color_);
 }
 
 int BubbleBorder2::GetArrowOffset() const {
   if (has_arrow(arrow_location())) {
     if (is_arrow_on_horizontal(arrow_location())) {
@@ skipping 184 matching lines @@
   canvas->ClipPath(path);
 
   // Use full bounds so that arrow is also painted.
   const gfx::Rect& bounds = view.bounds();
   PaintBackground(canvas, bounds);
 
   canvas->Restore();
 }
 
 }  // namespace views