ui: Bubble fix

chrome/browser/ui/views/status_bubble_views.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/status_bubble_views.h"
 
 #include <algorithm>
 
 #include "ash/wm/window_state.h"
 #include "base/bind.h"
@@ skipping 382 matching lines @@
   // Draw the bubble's shadow.
   int width = popup_bounds.width();
   int height = popup_bounds.height();
   gfx::Rect rect(gfx::Rect(popup_bounds.size()));
   SkPaint shadow_paint;
   shadow_paint.setAntiAlias(true);
   shadow_paint.setColor(kShadowColor);
 
   SkRRect rrect;
   rrect.setRectRadii(RectToSkRect(rect), (const SkVector*)rad);
-  canvas->sk_canvas()->drawRRect(rrect, paint);
+  canvas->sk_canvas()->drawRRect(rrect, shadow_paint);
 
+  const int shadow_size = 2 * kShadowThickness;
   // Draw the bubble.
-  rect.SetRect(SkIntToScalar(kShadowThickness),
-               SkIntToScalar(kShadowThickness),
-               SkIntToScalar(width),
-               SkIntToScalar(height));
+  rect.SetRect(SkIntToScalar(kShadowThickness), SkIntToScalar(kShadowThickness),
+               SkIntToScalar(width - shadow_size),
+               SkIntToScalar(height - shadow_size));
   rrect.setRectRadii(RectToSkRect(rect), (const SkVector*)rad);
   canvas->sk_canvas()->drawRRect(rrect, paint);
 
   // Draw highlight text and then the text body. In order to make sure the text
   // is aligned to the right on RTL UIs, we mirror the text bounds if the
   // locale is RTL.
   const gfx::FontList font_list;
-  int text_width = std::min(
-      gfx::GetStringWidth(text_, font_list),
-      width - (kShadowThickness * 2) - kTextPositionX - kTextHorizPadding);
-  int text_height = height - (kShadowThickness * 2);
+  int text_width =
+      std::min(gfx::GetStringWidth(text_, font_list),
+               width - shadow_size - kTextPositionX - kTextHorizPadding);
+  int text_height = height - shadow_size;
   gfx::Rect body_bounds(kShadowThickness + kTextPositionX,
                         kShadowThickness,
                         std::max(0, text_width),
                         std::max(0, text_height));
   body_bounds.set_x(GetMirroredXForRect(body_bounds));
   SkColor text_color =
       theme_service_->GetColor(ThemeProperties::COLOR_STATUS_BAR_TEXT);
   canvas->DrawStringRect(text_, font_list, text_color, body_bounds);
 }
 
@@ skipping 433 matching lines @@
 void StatusBubbleViews::SetBubbleWidth(int width) {
   size_.set_width(width);
   SetBounds(original_position_.x(), original_position_.y(),
             size_.width(), size_.height());
 }
 
 void StatusBubbleViews::CancelExpandTimer() {
   if (expand_timer_factory_.HasWeakPtrs())
     expand_timer_factory_.InvalidateWeakPtrs();
 }