Cleanup BubbleFrameView and BubbleBorder construction.

ui/views/bubble/bubble_delegate.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_delegate.h"
 
 #include "ui/base/animation/slide_animation.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/rect.h"
 #include "ui/native_theme/native_theme.h"
@@ skipping 166 matching lines @@
 bool BubbleDelegateView::CanActivate() const {
   return !use_focusless();
 }
 
 View* BubbleDelegateView::GetContentsView() {
   return this;
 }
 
 NonClientFrameView* BubbleDelegateView::CreateNonClientFrameView(
     Widget* widget) {
-  BubbleBorder::ArrowLocation arrow_loc = arrow_location();
-  if (base::i18n::IsRTL())
-    arrow_loc = BubbleBorder::horizontal_mirror(arrow_loc);
-  BubbleBorder* border = new BubbleBorder(arrow_loc, shadow_);
-  border->set_background_color(color());
-  BubbleFrameView* frame_view = new BubbleFrameView(margins(), border);
-  frame_view->set_background(new BubbleBackground(border));
-  return frame_view;
+  BubbleFrameView* frame = new BubbleFrameView(margins());
+  BubbleBorder::ArrowLocation arrow = base::i18n::IsRTL() ?
+      BubbleBorder::horizontal_mirror(arrow_location()) : arrow_location();
+  frame->SetBubbleBorder(new BubbleBorder(arrow, shadow(), color()));
+  return frame;
 }
 
 void BubbleDelegateView::OnWidgetClosing(Widget* widget) {
   if (anchor_widget() == widget) {
     anchor_widget_->RemoveObserver(this);
     anchor_view_ = NULL;
     anchor_widget_ = NULL;
   }
 }
 
@@ skipping 153 matching lines @@
 #if defined(OS_WIN) && !defined(USE_AURA)
 gfx::Rect BubbleDelegateView::GetBubbleClientBounds() const {
   gfx::Rect client_bounds(GetBubbleFrameView()->GetBoundsForClientView());
   client_bounds.Offset(
       border_widget_->GetWindowBoundsInScreen().OffsetFromOrigin());
   return client_bounds;
 }
 #endif
 
 }  // namespace views