Merge BorderContentsView into BubbleFrameView; simplify.

chrome/browser/ui/views/bookmarks/bookmark_bubble_view.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/bookmarks/bookmark_bubble_view.h"
 
 #include "base/string16.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
@@ skipping 102 matching lines @@
   }
 }
 
 views::View* BookmarkBubbleView::GetInitiallyFocusedView() {
   return title_tf_;
 }
 
 gfx::Rect BookmarkBubbleView::GetAnchorRect() {
   // Compensate for some built-in padding in the star image.
   gfx::Rect rect(BubbleDelegateView::GetAnchorRect());
-  rect.Offset(0, -5);
+  rect.Inset(0, anchor_view() ? 5 : 0);
   return rect;
 }
 
 void BookmarkBubbleView::WindowClosing() {
   // We have to reset |bubble_| here, not in our destructor, because we'll be
   // destroyed asynchronously and the shown state will be checked before then.
   DCHECK(bookmark_bubble_ == this);
   bookmark_bubble_ = NULL;
 
   content::NotificationService::current()->Notify(
@@ skipping 198 matching lines @@
       const BookmarkNode* new_parent =
           parent_model_.GetNodeAt(parent_combobox_->selected_item());
       if (new_parent != node->parent()) {
         UserMetrics::RecordAction(
             UserMetricsAction("BookmarkBubble_ChangeParent"));
         model->Move(node, new_parent, new_parent->child_count());
       }
     }
   }
 }