content settings bubble using new ui/views/bubble api.

chrome/browser/ui/views/location_bar/content_setting_image_view.h

Index: chrome/browser/ui/views/location_bar/content_setting_image_view.h
diff --git a/chrome/browser/ui/views/location_bar/content_setting_image_view.h b/chrome/browser/ui/views/location_bar/content_setting_image_view.h
index 3a948dda78184e520cbbd5a20009548e4a471c84..5f6a339a0977b23d2e6f7044d947bd3094995156 100644
--- a/chrome/browser/ui/views/location_bar/content_setting_image_view.h
+++ b/chrome/browser/ui/views/location_bar/content_setting_image_view.h
@@ -8,13 +8,12 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
-#include "chrome/browser/ui/views/bubble/bubble.h"
 #include "chrome/common/content_settings_types.h"
 #include "ui/base/animation/linear_animation.h"
 #include "views/controls/image_view.h"
 
 class ContentSettingImageModel;
-class Bubble;
+class ContentSettingBubbleContents;
 class LocationBarView;
 class TabContents;
 
@@ -22,8 +21,9 @@ namespace views {
 class MouseEvent;
 }
 
+class ContentSettingsDelegateView;
+
 class ContentSettingImageView : public views::ImageView,
-                                public BubbleDelegate,
                                 public ui::LinearAnimation {
  public:
   ContentSettingImageView(ContentSettingsType content_type,
@@ -41,15 +41,9 @@ class ContentSettingImageView : public views::ImageView,
   // views::ImageView overrides:
   virtual bool OnMousePressed(const views::MouseEvent& event) OVERRIDE;
   virtual void OnMouseReleased(const views::MouseEvent& event) OVERRIDE;
-  virtual void VisibilityChanged(View* starting_from, bool is_visible) OVERRIDE;
   virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
   virtual void OnPaintBackground(gfx::Canvas* canvas) OVERRIDE;
 
-  // BubbleDelegate overrides:
-  virtual void BubbleClosing(Bubble* bubble, bool closed_by_escape) OVERRIDE;
-  virtual bool CloseOnEscape() OVERRIDE;
-  virtual bool FadeInOnShow() OVERRIDE;
-
   // ui::LinearAnimation override:
   virtual void AnimateToState(double state) OVERRIDE;
 
@@ -58,9 +52,6 @@ class ContentSettingImageView : public views::ImageView,
   // The owning LocationBarView.
   LocationBarView* parent_;
 
-  // The currently shown info bubble if any.
-  Bubble* bubble_;
-
   string16 animated_text_;
   bool animation_in_progress_;
   int text_size_;