Convert InfoBubble to using BubbleBorder. This also replaces the border grap...

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
 
 #include "build/build_config.h"
 
 #include "app/gfx/canvas.h"
 #include "app/gfx/color_utils.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/file_util.h"
 #include "base/keyboard_codes.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/alternate_nav_url_fetcher.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
+#include "chrome/browser/bubble_positioner.h"
 #include "chrome/browser/command_updater.h"
 #include "chrome/browser/extensions/extension_browser_event_router.h"
 #include "chrome/browser/extensions/extension_tabs_module.h"
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/page_info_window.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/view_ids.h"
@@ skipping 54 matching lines @@
                                  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),
+      security_image_view_(profile, model, bubble_positioner),
       popup_window_mode_(popup_window_mode),
       first_run_bubble_(this),
       bubble_positioner_(bubble_positioner) {
   DCHECK(profile_);
   SetID(VIEW_ID_LOCATION_BAR);
   SetFocusable(true);
 
   if (!kBackground) {
     ResourceBundle &rb = ResourceBundle::GetSharedInstance();
     kBackground = rb.GetBitmapNamed(IDR_LOCATIONBG);
@@ skipping 549 matching lines @@
     page_actions = profile_->GetExtensionsService()->GetPageActions();
 
   // On startup we sometimes haven't loaded any extensions. This makes sure
   // we catch up when the extensions (and any page actions) load.
   if (page_actions.size() != page_action_image_views_.size()) {
     DeletePageActionViews();  // Delete the old views (if any).
 
     page_action_image_views_.resize(page_actions.size());
 
     for (size_t i = 0; i < page_actions.size(); ++i) {
-      page_action_image_views_[i] =
-          new PageActionImageView(this, profile_, page_actions[i]);
+      page_action_image_views_[i] = new PageActionImageView(this, profile_,
+          page_actions[i], bubble_positioner_);
       page_action_image_views_[i]->SetVisible(false);
       page_action_image_views_[i]->SetParentOwned(false);
       AddChildView(page_action_image_views_[i]);
     }
   }
 
   TabContents* contents = delegate_->GetTabContents();
   if (!page_action_image_views_.empty() && contents) {
     GURL url = GURL(WideToUTF8(model_->GetText()));
 
@@ skipping 372 matching lines @@
 
 #if defined(OS_WIN)
   FirstRunBubble::Show(profile_, GetWindow(), bounds, use_OEM_bubble);
 #else
   // First run bubble doesn't make sense for Chrome OS.
 #endif
 }
 
 // LocationBarImageView---------------------------------------------------------
 
-LocationBarView::LocationBarImageView::LocationBarImageView()
-  : info_bubble_(NULL),
-    show_info_bubble_task_(NULL) {
+LocationBarView::LocationBarImageView::LocationBarImageView(
+    const BubblePositioner* bubble_positioner)
+    : info_bubble_(NULL),
+      show_info_bubble_task_(NULL),
+      bubble_positioner_(bubble_positioner) {
 }
 
 LocationBarView::LocationBarImageView::~LocationBarImageView() {
   if (show_info_bubble_task_)
     show_info_bubble_task_->Cancel();
 
   if (info_bubble_)
     info_bubble_->Close();
 }
 
@@ skipping 25 matching lines @@
     info_bubble_->Close();
 }
 
 void LocationBarView::LocationBarImageView::InfoBubbleClosing(
     InfoBubble* info_bubble, bool closed_by_escape) {
   info_bubble_ = NULL;
 }
 
 void LocationBarView::LocationBarImageView::ShowInfoBubbleImpl(
     const std::wstring& text, SkColor text_color) {
+  gfx::Rect bounds(bubble_positioner_->GetLocationStackBounds());
   gfx::Point location;
   views::View::ConvertPointToScreen(this, &location);
-  gfx::Rect bounds(location.x(), location.y(), width(), height());
+  bounds.set_x(location.x());
+  bounds.set_width(width());
 
   views::Label* label = new views::Label(text);
   label->SetMultiLine(true);
   label->SetColor(text_color);
   label->SetFont(ResourceBundle::GetSharedInstance().GetFont(
       ResourceBundle::BaseFont).DeriveFont(2));
   label->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   label->SizeToFit(0);
   DCHECK(info_bubble_ == NULL);
   info_bubble_ = InfoBubble::Show(GetWindow(), bounds, label, this);
   show_info_bubble_task_ = NULL;
 }
 
 // SecurityImageView------------------------------------------------------------
 
 // static
 SkBitmap* LocationBarView::SecurityImageView::lock_icon_ = NULL;
 SkBitmap* LocationBarView::SecurityImageView::warning_icon_ = NULL;
 
-LocationBarView::SecurityImageView::SecurityImageView(Profile* profile,
-                                                      ToolbarModel* model)
-  : LocationBarImageView(),
-    profile_(profile),
-    model_(model) {
+LocationBarView::SecurityImageView::SecurityImageView(
+    Profile* profile,
+    ToolbarModel* model,
+    const BubblePositioner* bubble_positioner)
+    : LocationBarImageView(bubble_positioner),
+      profile_(profile),
+      model_(model) {
   if (!lock_icon_) {
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     lock_icon_ = rb.GetBitmapNamed(IDR_LOCK);
     warning_icon_ = rb.GetBitmapNamed(IDR_WARNING);
   }
   SetImageShown(LOCK);
 }
 
 LocationBarView::SecurityImageView::~SecurityImageView() {
 }
@@ skipping 30 matching lines @@
   ShowInfoBubbleImpl(text, GetColor(
       model_->GetSecurityLevel() == ToolbarModel::SECURE,
       SECURITY_INFO_BUBBLE_TEXT));
 }
 
 // PageActionImageView----------------------------------------------------------
 
 LocationBarView::PageActionImageView::PageActionImageView(
     LocationBarView* owner,
     Profile* profile,
-    const PageAction* page_action)
-    : LocationBarImageView(),
+    const PageAction* page_action,
+    const BubblePositioner* bubble_positioner)
+    : LocationBarImageView(bubble_positioner),
       owner_(owner),
       profile_(profile),
       page_action_(page_action),
       current_tab_id_(-1),
       tooltip_(page_action_->name()) {
   Extension* extension = profile->GetExtensionsService()->GetExtensionById(
       page_action->extension_id());
   DCHECK(extension);
 
   // Load the images this view needs asynchronously on the file thread. We'll
@@ skipping 118 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;
 }