Merge BorderContentsView into BubbleFrameView; simplify.

chrome/browser/ui/views/global_error_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/global_error_bubble_view.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/global_error.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/toolbar_view.h"
@@ skipping 11 matching lines @@
 enum {
   TAG_ACCEPT_BUTTON = 1,
   TAG_CANCEL_BUTTON,
 };
 
 const int kMaxBubbleViewWidth = 262;
 
 // The horizontal padding between the title and the icon.
 const int kTitleHorizontalPadding = 3;
 
-// The vertical offset of the wrench bubble from the wrench menu button.
-const int kWrenchBubblePointOffsetY = -6;
+// The vertical inset of the wrench bubble anchor from the wrench menu button.
+const int kAnchorVerticalInset = 5;
 
 const int kLayoutBottomPadding = 2;
 
 }  // namespace
 
 GlobalErrorBubbleView::GlobalErrorBubbleView(
     views::View* anchor_view,
     views::BubbleBorder::ArrowLocation location,
     Browser* browser,
     GlobalError* error)
@@ skipping 74 matching lines @@
 
   // Adjust the message label size in case buttons are too long.
   message_label->SizeToFit(layout->GetPreferredSize(this).width());
 }
 
 GlobalErrorBubbleView::~GlobalErrorBubbleView() {
 }
 
 gfx::Rect GlobalErrorBubbleView::GetAnchorRect() {
   gfx::Rect rect(views::BubbleDelegateView::GetAnchorRect());
-  rect.Offset(0, anchor_view() ? kWrenchBubblePointOffsetY : 0);
+  rect.Inset(0, anchor_view() ? kAnchorVerticalInset : 0);
   return rect;
 }
 
 void GlobalErrorBubbleView::ButtonPressed(views::Button* sender,
                                           const views::Event& event) {
   if (sender->tag() == TAG_ACCEPT_BUTTON)
     error_->BubbleViewAcceptButtonPressed();
   else if (sender->tag() == TAG_CANCEL_BUTTON)
     error_->BubbleViewCancelButtonPressed();
   else
     NOTREACHED();
   GetWidget()->Close();
 }
 
 void GlobalErrorBubbleView::WindowClosing() {
   error_->BubbleViewDidClose();
 }
 
 void GlobalError::ShowBubbleView(Browser* browser, GlobalError* error) {
   BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser);
   views::View* wrench_button = browser_view->toolbar()->app_menu();
   GlobalErrorBubbleView* bubble_view =
       new GlobalErrorBubbleView(wrench_button,
                                 views::BubbleBorder::TOP_RIGHT,
                                 browser,
                                 error);
   browser::CreateViewsBubble(bubble_view);
   bubble_view->StartFade(true);
 }