Convert the AutocompletePopupPositioner into a BubblePositioner in preparatio...

chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc

 // Copyright (c) 2009 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/views/autocomplete/autocomplete_popup_contents_view.h"
 
 #include "app/gfx/canvas.h"
 #include "app/gfx/color_utils.h"
 #include "app/gfx/insets.h"
 #include "app/gfx/path.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/theme_provider.h"
 #include "base/compiler_specific.h"
 #include "chrome/browser/autocomplete/autocomplete_edit_view.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_model.h"
+#include "chrome/browser/bubble_positioner.h"
 #include "chrome/browser/views/bubble_border.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "third_party/skia/include/core/SkShader.h"
 #include "third_party/icu/public/common/unicode/ubidi.h"
 #include "views/widget/widget.h"
 
 #if defined(OS_WIN)
 #include <objidl.h>
 #include <commctrl.h>
@@ skipping 548 matching lines @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // AutocompletePopupContentsView, public:
 
 AutocompletePopupContentsView::AutocompletePopupContentsView(
     const gfx::Font& font,
     AutocompleteEditView* edit_view,
     AutocompleteEditModel* edit_model,
     Profile* profile,
-    AutocompletePopupPositioner* popup_positioner)
+    const BubblePositioner* bubble_positioner)
 #if defined(OS_WIN)
     : popup_(new AutocompletePopupWin(this)),
 #else
     : popup_(new AutocompletePopupGtk(this)),
 #endif
       model_(new AutocompletePopupModel(this, edit_model, profile)),
       edit_view_(edit_view),
-      popup_positioner_(popup_positioner),
+      bubble_positioner_(bubble_positioner),
       result_font_(font.DeriveFont(kEditFontAdjust)),
       ALLOW_THIS_IN_INITIALIZER_LIST(size_animation_(this)) {
-  set_border(new BubbleBorder);
+  // The following little dance is required because set_border() requires a
+  // pointer to a non-const object.
+  BubbleBorder* bubble_border = new BubbleBorder;
+  bubble_border_ = bubble_border;
+  set_border(bubble_border);
 }
 
 gfx::Rect AutocompletePopupContentsView::GetPopupBounds() const {
   if (!size_animation_.IsAnimating())
     return target_bounds_;
 
   gfx::Rect current_frame_bounds = start_bounds_;
   int total_height_delta = target_bounds_.height() - start_bounds_.height();
   // Round |current_height_delta| instead of truncating so we won't leave single
   // white pixels at the bottom of the popup as long when animating very small
@@ skipping 36 matching lines @@
       result_view = new AutocompleteResultView(this, i, result_font_);
       AddChildView(result_view);
     } else {
       result_view = static_cast<AutocompleteResultView*>(GetChildViewAt(i));
     }
     result_view->set_match(GetMatchAtIndex(i));
     total_child_height += result_view->GetPreferredSize().height();
   }
 
   // Calculate desired bounds.
-  gfx::Rect new_target_bounds = popup_positioner_->GetPopupBounds();
-  new_target_bounds.set_height(total_child_height);
-  gfx::Insets insets;
-  border()->GetInsets(&insets);
-  new_target_bounds.Inset(-insets.left(), -insets.top(), -insets.right(),
-                          -insets.bottom());
+  gfx::Rect location_stack_bounds =
+      bubble_positioner_->GetLocationStackBounds();
+  gfx::Rect new_target_bounds(bubble_border_->GetBounds(location_stack_bounds,
+      gfx::Size(location_stack_bounds.width(), total_child_height)));
 
   // If we're animating and our target height changes, reset the animation.
   // NOTE: If we just reset blindly on _every_ update, then when the user types
   // rapidly we could get "stuck" trying repeatedly to animate shrinking by the
   // last few pixels to get to one visible result.
   if (new_target_bounds.height() != target_bounds_.height())
     size_animation_.Reset();
   target_bounds_ = new_target_bounds;
 
   if (!popup_->IsCreated()) {
@@ skipping 194 matching lines @@
   canvas->drawColor(SkColorSetA(GetColor(NORMAL, BACKGROUND), alpha),
                     SkXfermode::kDstIn_Mode);
 }
 
 // static
 AutocompletePopupView* AutocompletePopupView::CreatePopupView(
     const gfx::Font& font,
     AutocompleteEditView* edit_view,
     AutocompleteEditModel* edit_model,
     Profile* profile,
-    AutocompletePopupPositioner* popup_positioner) {
+    const BubblePositioner* bubble_positioner) {
   return new AutocompletePopupContentsView(font, edit_view, edit_model,
-                                           profile, popup_positioner);
+                                           profile, bubble_positioner);
 }