Convert the AutocompletePopupPositioner into a BubblePositioner in preparatio...

chrome/browser/views/location_bar_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/location_bar_view.h"
 
 #if defined(OS_LINUX)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 68 matching lines @@
   if (template_url)
     return template_url->AdjustedShortNameForLocaleDirection();
   return std::wstring();
 }
 
 LocationBarView::LocationBarView(Profile* profile,
                                  CommandUpdater* command_updater,
                                  ToolbarModel* model,
                                  Delegate* delegate,
                                  bool popup_window_mode,
-                                 AutocompletePopupPositioner* popup_positioner)
+                                 const BubblePositioner* bubble_positioner)
     : profile_(profile),
       command_updater_(command_updater),
       model_(model),
       delegate_(delegate),
       disposition_(CURRENT_TAB),
       location_entry_view_(NULL),
       selected_keyword_view_(profile),
       keyword_hint_view_(profile),
       type_to_search_view_(l10n_util::GetString(IDS_OMNIBOX_EMPTY_TEXT)),
       security_image_view_(profile, model),
       popup_window_mode_(popup_window_mode),
       first_run_bubble_(this),
-      popup_positioner_(popup_positioner) {
+      bubble_positioner_(bubble_positioner) {
   DCHECK(profile_);
   SetID(VIEW_ID_LOCATION_BAR);
   SetFocusable(true);
 
   if (!kBackground) {
     ResourceBundle &rb = ResourceBundle::GetSharedInstance();
     kBackground = rb.GetBitmapNamed(IDR_LOCATIONBG);
     kPopupBackground = rb.GetBitmapNamed(IDR_LOCATIONBG_POPUPMODE_CENTER);
   }
 }
@@ skipping 18 matching lines @@
   }
 
   // URL edit field.
   // View container for URL edit field.
 #if defined(OS_WIN)
   views::Widget* widget = GetWidget();
   location_entry_.reset(new AutocompleteEditViewWin(font_, this, model_, this,
                                                     widget->GetNativeView(),
                                                     profile_, command_updater_,
                                                     popup_window_mode_,
-                                                    popup_positioner_));
+                                                    bubble_positioner_));
 #else
   location_entry_.reset(new AutocompleteEditViewGtk(this, model_, profile_,
                                                     command_updater_,
                                                     popup_window_mode_,
-                                                    popup_positioner_));
+                                                    bubble_positioner_));
   location_entry_->Init();
   // Make all the children of the widget visible. NOTE: this won't display
   // anything, it just toggles the visible flag.
   gtk_widget_show_all(location_entry_->widget());
   // Hide the widget. NativeViewHostGtk will make it visible again as
   // necessary.
   gtk_widget_hide(location_entry_->widget());
 #endif
   location_entry_view_ = new views::NativeViewHost;
   location_entry_view_->SetID(VIEW_ID_AUTOCOMPLETE);
@@ skipping 1161 matching lines @@
 }
 
 int LocationBarView::PageActionVisibleCount() {
   int result = 0;
   for (size_t i = 0; i < page_action_image_views_.size(); i++) {
     if (page_action_image_views_[i]->IsVisible())
       ++result;
   }
   return result;
 }