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

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

 // Copyright (c) 2011 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/ui/views/location_bar/content_setting_image_view.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"
@@ skipping 34 matching lines @@
 }
 
 ContentSettingImageView::ContentSettingImageView(
     ContentSettingsType content_type,
     LocationBarView* parent)
     : ui::LinearAnimation(kMoveTimeMs, kFrameRateHz, NULL),
       content_setting_image_model_(
           ContentSettingImageModel::CreateContentSettingImageModel(
               content_type)),
       parent_(parent),
-      bubble_(NULL),
       animation_in_progress_(false),
       text_size_(0),
       visible_text_size_(0) {
   SetHorizontalAlignment(ImageView::LEADING);
 }
 
 ContentSettingImageView::~ContentSettingImageView() {
-  if (bubble_)
-    bubble_->Close();
 }
 
 void ContentSettingImageView::UpdateFromTabContents(TabContents* tab_contents) {
   content_setting_image_model_->UpdateFromTabContents(tab_contents);
   if (!content_setting_image_model_->is_visible()) {
     SetVisible(false);
     return;
   }
   SetImage(ResourceBundle::GetSharedInstance().GetBitmapNamed(
       content_setting_image_model_->get_icon()));
@@ skipping 49 matching lines @@
 }
 
 void ContentSettingImageView::OnMouseReleased(const views::MouseEvent& event) {
   if (!HitTest(event.location()))
     return;
 
   TabContentsWrapper* tab_contents = parent_->GetTabContentsWrapper();
   if (!tab_contents)
     return;
 
-  gfx::Rect screen_bounds(GetImageBounds());
-  gfx::Point origin(screen_bounds.origin());
-  views::View::ConvertPointToScreen(this, &origin);
-  screen_bounds.set_origin(origin);
   Profile* profile = parent_->browser()->profile();
-  ContentSettingBubbleContents* bubble_contents =
-      new ContentSettingBubbleContents(
-          ContentSettingBubbleModel::CreateContentSettingBubbleModel(
-              parent_->browser(), tab_contents, profile,
-              content_setting_image_model_->get_content_settings_type()),
-          profile, tab_contents->tab_contents());
-  bubble_ = Bubble::Show(GetWidget(), screen_bounds,
-                         views::BubbleBorder::TOP_RIGHT,
-                         views::BubbleBorder::ALIGN_ARROW_TO_MID_ANCHOR,
-                         bubble_contents, this);
-  bubble_contents->set_bubble(bubble_);
-}
-
-void ContentSettingImageView::VisibilityChanged(View* starting_from,
-                                                bool is_visible) {
-  if (!is_visible && bubble_)
-    bubble_->Close();
+  ContentSettingBubbleContents* bubble = new ContentSettingBubbleContents(
+      ContentSettingBubbleModel::CreateContentSettingBubbleModel(
+          parent_->browser(),
+          tab_contents,
+          profile,
+          content_setting_image_model_->get_content_settings_type()),
+      profile,
+      tab_contents->tab_contents(),
+      this,
+      views::BubbleBorder::TOP_RIGHT);
+  views::BubbleDelegateView::CreateBubble(bubble);
+  bubble->Show();
 }
 
 void ContentSettingImageView::OnPaint(gfx::Canvas* canvas) {
   gfx::Insets current_insets;
   if (border())
     border()->GetInsets(&current_insets);
   // During the animation we draw a border, an icon and the text. The text area
   // is changing in size during the animation, giving the appearance of the text
   // sliding out and then back in. When the text completely slid out the yellow
   // border is no longer painted around the icon. |visible_text_size_| is 0 when
@@ skipping 41 matching lines @@
                                        kBoxCornerRadius, paint);
   SkPaint outer_paint;
   outer_paint.setStyle(SkPaint::kStroke_Style);
   outer_paint.setColor(kBorderColor);
   color_rect.inset(SkIntToScalar(kEdgeThickness),
                    SkIntToScalar(kEdgeThickness));
   canvas->GetSkCanvas()->drawRoundRect(color_rect, kBoxCornerRadius,
                                        kBoxCornerRadius, outer_paint);
 }
 
-void ContentSettingImageView::BubbleClosing(Bubble* bubble,
-                                            bool closed_by_escape) {
-  bubble_ = NULL;
-}
-
-bool ContentSettingImageView::CloseOnEscape() {
-  return true;
-}
-
-bool ContentSettingImageView::FadeInOnShow() {
-  return false;
-}
-
 void ContentSettingImageView::AnimateToState(double state) {
   if (state >= 1.0) {
     // Animaton is over, clear the variables.
     animation_in_progress_ = false;
     visible_text_size_ = 0;
   } else if (state < kAnimatingFraction) {
     visible_text_size_ = static_cast<int>(text_size_ * state /
                                           kAnimatingFraction);
   } else if (state > (1.0 - kAnimatingFraction)) {
     visible_text_size_ = static_cast<int>(text_size_ * (1.0 - state) /
                                           kAnimatingFraction);
   } else {
     visible_text_size_ = text_size_;
   }
   parent_->Layout();
   parent_->SchedulePaint();
 }