Revert 198491 "Render opaque border with no shadow for web conte..."

trunk/src/ui/views/bubble/bubble_border.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.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 94 matching lines @@
   if (set)
     return set;
 
   switch (shadow) {
     case BubbleBorder::SHADOW:
       // Note: SHADOW's border interior thickness is actually 10, but 0 is used
       // here to match the legacy appearance of SHADOW's extra large inset.
       set = new BorderImages(kShadowImages, kShadowArrows, 0, 0, 3);
       break;
     case BubbleBorder::NO_SHADOW:
-    case BubbleBorder::NO_SHADOW_OPAQUE_BORDER:
       set = new BorderImages(kNoShadowImages, kNoShadowArrows, 6, 7, 4);
       break;
     case BubbleBorder::BIG_SHADOW:
       set = new BorderImages(kBigShadowImages, kBigShadowArrows, 23, 9, 2);
       break;
     case BubbleBorder::SMALL_SHADOW:
       set = new BorderImages(kSmallShadowImages, kSmallShadowArrows, 5, 6, 2);
       break;
     case BubbleBorder::SHADOW_COUNT:
       NOTREACHED();
@@ skipping 200 matching lines @@
   path.close();
 
   SkPaint paint;
   paint.setStyle(SkPaint::kFill_Style);
   paint.setColor(background_color_);
 
   canvas->DrawPath(path, paint);
 }
 
 void BubbleBackground::Paint(gfx::Canvas* canvas, views::View* view) const {
-  if (border_->shadow() == BubbleBorder::NO_SHADOW_OPAQUE_BORDER)
-    canvas->DrawColor(border_->background_color());
-
   // Clip out the client bounds to prevent overlapping transparent widgets.
   if (!border_->client_bounds().IsEmpty()) {
     SkRect client_rect(gfx::RectToSkRect(border_->client_bounds()));
     canvas->sk_canvas()->clipRect(client_rect, SkRegion::kDifference_Op);
   }
 
   // Fill the contents with a round-rect region to match the border images.
   SkPaint paint;
   paint.setAntiAlias(true);
   paint.setStyle(SkPaint::kFill_Style);
   paint.setColor(border_->background_color());
   SkPath path;
   gfx::Rect bounds(view->GetLocalBounds());
   bounds.Inset(border_->GetInsets());
 
   // Note: This matches the legacy appearance of SHADOW's extra large inset.
   if (border_->shadow() == BubbleBorder::SHADOW)
     bounds.Inset(-10, -10);
 
   SkScalar radius = SkIntToScalar(border_->GetBorderCornerRadius());
   path.addRoundRect(gfx::RectToSkRect(bounds), radius, radius);
   canvas->DrawPath(path, paint);
 }
 
 }  // namespace views