Merge BorderContentsView into BubbleFrameView; simplify.

chrome/browser/ui/views/first_run_bubble.cc

 // Copyright (c) 2011 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/first_run_bubble.h"
 
 #include "base/bind.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/first_run/first_run.h"
 #include "chrome/browser/search_engines/util.h"
@@ skipping 12 matching lines @@
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/events/event.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/widget/widget.h"
 
 using content::UserMetricsAction;
 
 namespace {
-const int kAnchorVerticalOffset = -4;
+const int kAnchorVerticalInset = 5;
 const int kLayoutTopInset = 1;
 const int kLayoutLeftInset = 2;
 const int kLayoutBottomInset = 7;
 const int kLayoutRightInset = 2;
 }
 
 // static
 FirstRunBubble* FirstRunBubble::ShowBubble(
     Profile* profile,
     views::View* anchor_view,
@@ skipping 51 matching lines @@
                   views::GridLayout::LEADING);
   layout->AddPaddingRow(0, views::kRelatedControlSmallVerticalSpacing);
 
   layout->StartRow(0, 0);
   layout->AddView(label2);
 }
 
 gfx::Rect FirstRunBubble::GetAnchorRect() {
   // Compensate for padding in anchor.
   gfx::Rect rect(BubbleDelegateView::GetAnchorRect());
-  rect.Offset(0, anchor_view() ? kAnchorVerticalOffset : 0);
+  rect.Inset(0, anchor_view() ? kAnchorVerticalInset : 0);
   return rect;
 }
 
 FirstRunBubble::FirstRunBubble(
     Profile* profile,
     views::View* anchor_view,
     views::BubbleBorder::ArrowLocation arrow_location,
     FirstRun::BubbleType bubble_type)
     : views::BubbleDelegateView(anchor_view, arrow_location),
       profile_(profile),
       bubble_type_(bubble_type) {
 }
 
 FirstRunBubble::~FirstRunBubble() {
 }
 
 void FirstRunBubble::ButtonPressed(views::Button* sender,
                                    const views::Event& event) {
   if (bubble_type_ == FirstRun::OEM_BUBBLE) {
     content::RecordAction(
         UserMetricsAction("FirstRunOEMBubbleView_Clicked"));
   }
   GetWidget()->Close();
 }