Merge BorderContentsView into BubbleFrameView; simplify.

chrome/browser/speech/speech_input_bubble_views.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/speech/speech_input_bubble.h"
 
 #include <algorithm>
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 94 matching lines @@
 void SpeechInputBubbleView::OnWidgetActivationChanged(views::Widget* widget,
                                                       bool active) {
   if (widget == GetWidget() && !active)
     delegate_->InfoBubbleFocusChanged();
   BubbleDelegateView::OnWidgetActivationChanged(widget, active);
 }
 
 gfx::Rect SpeechInputBubbleView::GetAnchorRect() {
   gfx::Rect container_rect;
   tab_contents_->GetContainerBounds(&container_rect);
-  gfx::Point anchor(container_rect.x() + element_rect_.CenterPoint().x(),
-                    container_rect.y() + element_rect_.bottom());
-  if (!container_rect.Contains(anchor))
+  gfx::Rect anchor(element_rect_);
+  anchor.Offset(container_rect.origin());
+  if (!container_rect.Intersects(anchor))
     return BubbleDelegateView::GetAnchorRect();
-  return gfx::Rect(anchor, gfx::Size());
+  return anchor;
 }
 
 void SpeechInputBubbleView::Init() {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   const gfx::Font& font = rb.GetFont(ResourceBundle::MediumFont);
 
   heading_ = new views::Label(
       l10n_util::GetStringUTF16(IDS_SPEECH_INPUT_BUBBLE_HEADING));
   heading_->set_border(views::Border::CreateEmptyBorder(
       kBubbleHeadingVertMargin, 0, kBubbleHeadingVertMargin, 0));
@@ skipping 239 matching lines @@
 }
 
 }  // namespace
 
 SpeechInputBubble* SpeechInputBubble::CreateNativeBubble(
     TabContents* tab_contents,
     SpeechInputBubble::Delegate* delegate,
     const gfx::Rect& element_rect) {
   return new SpeechInputBubbleImpl(tab_contents, delegate, element_rect);
 }