Avoid overriding Bubble's GetAnchorRect() where possible.

chrome/browser/ui/views/global_error_bubble_view.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 "chrome/browser/ui/views/global_error_bubble_view.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/global_error/global_error.h"
 #include "chrome/browser/ui/global_error/global_error_service.h"
 #include "chrome/browser/ui/global_error/global_error_service_factory.h"
@@ skipping 47 matching lines @@
 // GlobalErrorBubbleView -------------------------------------------------------
 
 GlobalErrorBubbleView::GlobalErrorBubbleView(
     views::View* anchor_view,
     views::BubbleBorder::ArrowLocation location,
     Browser* browser,
     const base::WeakPtr<GlobalError>& error)
     : BubbleDelegateView(anchor_view, location),
       browser_(browser),
       error_(error) {
-  DCHECK(error_);
+  // Compensate for built-in vertical padding in the anchor view's image.
+  set_anchor_insets(
+      gfx::Insets(kAnchorVerticalInset, 0, kAnchorVerticalInset, 0));
+
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   int resource_id = error_->GetBubbleViewIconResourceID();
   scoped_ptr<views::ImageView> image_view(new views::ImageView());
   image_view->SetImage(rb.GetImageNamed(resource_id).ToImageSkia());
 
   string16 title_string(error_->GetBubbleViewTitle());
   scoped_ptr<views::Label> title_label(new views::Label(title_string));
   title_label->SetMultiLine(true);
   title_label->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   title_label->SetFont(title_label->font().DeriveFont(1));
@@ skipping 59 matching lines @@
   if (cancel_button.get())
     layout->AddView(cancel_button.release());
 
   // 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.Inset(0, anchor_view() ? kAnchorVerticalInset : 0);
-  return rect;
-}
-
 void GlobalErrorBubbleView::ButtonPressed(views::Button* sender,
                                           const ui::Event& event) {
   if (error_) {
     if (sender->tag() == TAG_ACCEPT_BUTTON)
       error_->BubbleViewAcceptButtonPressed(browser_);
     else if (sender->tag() == TAG_CANCEL_BUTTON)
       error_->BubbleViewCancelButtonPressed(browser_);
     else
       NOTREACHED();
   }
   GetWidget()->Close();
 }
 
 void GlobalErrorBubbleView::WindowClosing() {
   if (error_)
     error_->BubbleViewDidClose(browser_);
 }
 
 void GlobalErrorBubbleView::CloseBubbleView() {
   GetWidget()->Close();
 }