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

chrome/browser/views/location_bar_view.h

 // 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.
 
 #ifndef CHROME_BROWSER_VIEWS_LOCATION_BAR_VIEW_H_
 #define CHROME_BROWSER_VIEWS_LOCATION_BAR_VIEW_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 240 matching lines @@
     DISALLOW_COPY_AND_ASSIGN(KeywordHintView);
   };
 
 
   class ShowInfoBubbleTask;
   class ShowFirstRunBubbleTask;
 
   class LocationBarImageView : public views::ImageView,
                                public InfoBubbleDelegate {
    public:
-    LocationBarImageView();
+    explicit LocationBarImageView(const BubblePositioner* bubble_positioner);
     virtual ~LocationBarImageView();
 
     // Overridden from view for the mouse hovering.
     virtual void OnMouseMoved(const views::MouseEvent& event);
     virtual void OnMouseExited(const views::MouseEvent& event);
     virtual bool OnMousePressed(const views::MouseEvent& event) = 0;
 
     // InfoBubbleDelegate
     void InfoBubbleClosing(InfoBubble* info_bubble, bool closed_by_escape);
     bool CloseOnEscape() { return true; }
 
     virtual void ShowInfoBubble() = 0;
 
    protected:
     void ShowInfoBubbleImpl(const std::wstring& text, SkColor text_color);
 
    private:
     friend class ShowInfoBubbleTask;
 
     // The currently shown info bubble if any.
     InfoBubble* info_bubble_;
 
     // A task used to display the info bubble when the mouse hovers on the
     // image.
     ShowInfoBubbleTask* show_info_bubble_task_;
 
+    // A positioner used to give the info bubble the correct target bounds.  The
+    // caller maintains ownership of this and must ensure it's kept alive.
+    const BubblePositioner* bubble_positioner_;
+
     DISALLOW_COPY_AND_ASSIGN(LocationBarImageView);
   };
 
   // SecurityImageView is used to display the lock or warning icon when the
   // current URL's scheme is https.
   //
   // If a message has been set with SetInfoBubbleText, it displays an info
   // bubble when the mouse hovers on the image.
   class SecurityImageView : public LocationBarImageView {
    public:
     enum Image {
       LOCK = 0,
       WARNING
     };
 
-    SecurityImageView(Profile* profile, ToolbarModel* model_);
+    SecurityImageView(Profile* profile,
+                      ToolbarModel* model_,
+                      const BubblePositioner* bubble_positioner);
     virtual ~SecurityImageView();
 
     // Sets the image that should be displayed.
     void SetImageShown(Image image);
 
     // Overridden from view for the mouse hovering.
     virtual bool OnMousePressed(const views::MouseEvent& event);
 
     void set_profile(Profile* profile) { profile_ = profile; }
 
@@ skipping 20 matching lines @@
     DISALLOW_COPY_AND_ASSIGN(SecurityImageView);
   };
 
   // PageActionImageView is used to display the icon for a given PageAction
   // and notify the extension when the icon is clicked.
   class PageActionImageView : public LocationBarImageView,
                               public ImageLoadingTracker::Observer {
    public:
     PageActionImageView(LocationBarView* owner,
                         Profile* profile,
-                        const PageAction* page_action);
+                        const PageAction* page_action,
+                        const BubblePositioner* bubble_positioner);
     virtual ~PageActionImageView();
 
     // Overridden from view for the mouse hovering.
     virtual bool OnMousePressed(const views::MouseEvent& event);
 
     // Overridden from LocationBarImageView.
     virtual void ShowInfoBubble();
 
     // Overridden from ImageLoadingTracker.
     virtual void OnImageLoaded(SkBitmap* image, size_t index);
@@ skipping 166 matching lines @@
   // The positioner that places the omnibox and info bubbles.
   const BubblePositioner* bubble_positioner_;
 
   // Storage of string needed for accessibility.
   std::wstring accessible_name_;
 
   DISALLOW_COPY_AND_ASSIGN(LocationBarView);
 };
 
 #endif  // CHROME_BROWSER_VIEWS_LOCATION_BAR_VIEW_H_