Merge BorderContentsView into BubbleFrameView; simplify.

chrome/browser/ui/views/first_run_bubble.cc

Index: chrome/browser/ui/views/first_run_bubble.cc
diff --git a/chrome/browser/ui/views/first_run_bubble.cc b/chrome/browser/ui/views/first_run_bubble.cc
index 20b4fd860ec84c8a782eee1a5dc0234a392c8e42..eb6ac0309c3610f145f31642b53de9864b15b1f7 100644
--- a/chrome/browser/ui/views/first_run_bubble.cc
+++ b/chrome/browser/ui/views/first_run_bubble.cc
@@ -28,7 +28,7 @@
 #include "ui/views/widget/widget.h"
 
 namespace {
-const int kAnchorVerticalOffset = -4;
+const int kAnchorVerticalInset = 5;
 const int kLayoutTopInset = 1;
 const int kLayoutLeftInset = 2;
 const int kLayoutBottomInset = 7;
@@ -100,7 +100,7 @@ void FirstRunBubble::Init() {
 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;
 }