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

chrome/browser/ui/views/content_setting_bubble_contents.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/content_setting_bubble_contents.h"
 
 #if defined(TOOLKIT_USES_GTK)
 #include <gdk/gdk.h>
 #endif
 
 #include <algorithm>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"
 #include "chrome/browser/ui/views/browser_dialogs.h"
-#include "chrome/browser/ui/views/bubble/bubble.h"
 #include "content/browser/plugin_service.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
 #include "views/controls/button/radio_button.h"
 #include "views/controls/button/text_button.h"
@@ skipping 68 matching lines @@
   static HCURSOR g_hand_cursor = LoadCursor(NULL, IDC_HAND);
   return g_hand_cursor;
 #elif defined(TOOLKIT_USES_GTK)
   return gfx::GetCursor(GDK_HAND2);
 #endif
 }
 
 ContentSettingBubbleContents::ContentSettingBubbleContents(
     ContentSettingBubbleModel* content_setting_bubble_model,
     Profile* profile,
-    TabContents* tab_contents)
-    : content_setting_bubble_model_(content_setting_bubble_model),
+    TabContents* tab_contents,
+    views::View* anchor_view,
+    views::BubbleBorder::ArrowLocation arrow_location)
+    : BubbleDelegateView(anchor_view, arrow_location, SK_ColorWHITE),
+      content_setting_bubble_model_(content_setting_bubble_model),
       profile_(profile),
       tab_contents_(tab_contents),
-      bubble_(NULL),
       custom_link_(NULL),
       manage_link_(NULL),
       close_button_(NULL) {
   registrar_.Add(this, content::NOTIFICATION_TAB_CONTENTS_DESTROYED,
                  content::Source<TabContents>(tab_contents));
 }
 
 ContentSettingBubbleContents::~ContentSettingBubbleContents() {
 }
 
 gfx::Size ContentSettingBubbleContents::GetPreferredSize() {
   gfx::Size preferred_size(views::View::GetPreferredSize());
   int preferred_width =
       (!content_setting_bubble_model_->bubble_content().domain_lists.empty() &&
        (kMinMultiLineContentsWidth > preferred_size.width())) ?
       kMinMultiLineContentsWidth : preferred_size.width();
   preferred_size.set_width(std::min(preferred_width, kMaxContentsWidth));
   return preferred_size;
 }
 
-void ContentSettingBubbleContents::ViewHierarchyChanged(bool is_add,
-                                                        View* parent,
-                                                        View* child) {
-  if (is_add && (child == this))
-    InitControlLayout();
+gfx::Point ContentSettingBubbleContents::GetAnchorPoint() {
+  return BubbleDelegateView::GetAnchorPoint().Subtract(gfx::Point(0, 5));
 }
 
-void ContentSettingBubbleContents::ButtonPressed(views::Button* sender,
-                                                 const views::Event& event) {
-  if (sender == close_button_) {
-    bubble_->set_fade_away_on_close(true);
-    bubble_->Close();  // CAREFUL: This deletes us.
-    return;
-  }
-
-  for (RadioGroup::const_iterator i = radio_group_.begin();
-       i != radio_group_.end(); ++i) {
-    if (sender == *i) {
-      content_setting_bubble_model_->OnRadioClicked(i - radio_group_.begin());
-      return;
-    }
-  }
-  NOTREACHED() << "unknown radio";
-}
-
-void ContentSettingBubbleContents::LinkClicked(views::Link* source,
-                                               int event_flags) {
-  if (source == custom_link_) {
-    content_setting_bubble_model_->OnCustomLinkClicked();
-    bubble_->set_fade_away_on_close(true);
-    bubble_->Close();  // CAREFUL: This deletes us.
-    return;
-  }
-  if (source == manage_link_) {
-    bubble_->set_fade_away_on_close(true);
-    content_setting_bubble_model_->OnManageLinkClicked();
-    // CAREFUL: Showing the settings window activates it, which deactivates the
-    // info bubble, which causes it to close, which deletes us.
-    return;
-  }
-
-  PopupLinks::const_iterator i(popup_links_.find(source));
-  DCHECK(i != popup_links_.end());
-  content_setting_bubble_model_->OnPopupClicked(i->second);
-}
-
-void ContentSettingBubbleContents::Observe(
-    int type,
-    const content::NotificationSource& source,
-    const content::NotificationDetails& details) {
-  DCHECK(type == content::NOTIFICATION_TAB_CONTENTS_DESTROYED);
-  DCHECK(source == content::Source<TabContents>(tab_contents_));
-  tab_contents_ = NULL;
-}
-
-void ContentSettingBubbleContents::InitControlLayout() {
+void ContentSettingBubbleContents::Init() {
   using views::GridLayout;
 
   GridLayout* layout = new views::GridLayout(this);
   SetLayoutManager(layout);
 
   const int single_column_set_id = 0;
   views::ColumnSet* column_set = layout->AddColumnSet(single_column_set_id);
   column_set->AddColumn(GridLayout::LEADING, GridLayout::FILL, 1,
                         GridLayout::USE_PREF, 0, 0);
 
@@ skipping 132 matching lines @@
 
   layout->StartRow(0, double_column_set_id);
   manage_link_ = new views::Link(UTF8ToUTF16(bubble_content.manage_link));
   manage_link_->set_listener(this);
   layout->AddView(manage_link_);
 
   close_button_ = new views::NativeTextButton(
       this, l10n_util::GetStringUTF16(IDS_DONE));
   layout->AddView(close_button_);
 }
+
+void ContentSettingBubbleContents::ButtonPressed(views::Button* sender,
+                                                 const views::Event& event) {
+  if (sender == close_button_) {
+    StartFade(false);
+    return;
+  }
+
+  for (RadioGroup::const_iterator i = radio_group_.begin();
+       i != radio_group_.end(); ++i) {
+    if (sender == *i) {
+      content_setting_bubble_model_->OnRadioClicked(i - radio_group_.begin());
+      return;
+    }
+  }
+  NOTREACHED() << "unknown radio";
+}
+
+void ContentSettingBubbleContents::LinkClicked(views::Link* source,
+                                               int event_flags) {
+  if (source == custom_link_) {
+    content_setting_bubble_model_->OnCustomLinkClicked();
+    StartFade(false);
+    return;
+  }
+  if (source == manage_link_) {
+    StartFade(false);
+    content_setting_bubble_model_->OnManageLinkClicked();
+    // CAREFUL: Showing the settings window activates it, which deactivates the
+    // info bubble, which causes it to close, which deletes us.
+    return;
+  }
+
+  PopupLinks::const_iterator i(popup_links_.find(source));
+  DCHECK(i != popup_links_.end());
+  content_setting_bubble_model_->OnPopupClicked(i->second);
+}
+
+void ContentSettingBubbleContents::Observe(
+    int type,
+    const content::NotificationSource& source,
+    const content::NotificationDetails& details) {
+  DCHECK(type == content::NOTIFICATION_TAB_CONTENTS_DESTROYED);
+  DCHECK(source == content::Source<TabContents>(tab_contents_));
+  tab_contents_ = NULL;
+}