Revert 110824 - Variety of crashes on XP dbg bots

chrome/browser/ui/views/extensions/extension_installed_bubble.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/extensions/extension_installed_bubble.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 11 matching lines @@
 #include "chrome/browser/ui/views/toolbar_view.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_action.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources_standard.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
-#include "ui/views/layout/fill_layout.h"
 #include "ui/views/layout/layout_constants.h"
 #include "views/controls/button/image_button.h"
 #include "views/controls/image_view.h"
 #include "views/controls/label.h"
 #include "views/controls/link.h"
 #include "views/controls/link_listener.h"
 #include "views/view.h"
 
 namespace {
 
@@ skipping 41 matching lines @@
 // InstalledBubbleContent is the content view which is placed in the
 // ExtensionInstalledBubble. It displays the install icon and explanatory
 // text about the installed extension.
 class InstalledBubbleContent : public views::View,
                                public views::ButtonListener,
                                public views::LinkListener {
  public:
   InstalledBubbleContent(Browser* browser,
                          const Extension* extension,
                          ExtensionInstalledBubble::BubbleType type,
-                         SkBitmap* icon,
-                         ExtensionInstalledBubble* bubble)
+                         SkBitmap* icon)
       : browser_(browser),
         extension_id_(extension->id()),
-        bubble_(bubble),
+        bubble_(NULL),
         type_(type),
         info_(NULL) {
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     const gfx::Font& font = rb.GetFont(ResourceBundle::BaseFont);
 
     // Scale down to 43x43, but allow smaller icons (don't scale up).
     gfx::Size size(icon->width(), icon->height());
     if (size.width() > kIconSize || size.height() > kIconSize)
       size = gfx::Size(kIconSize, kIconSize);
     icon_ = new views::ImageView();
@@ skipping 58 matching lines @@
     close_button_ = new views::ImageButton(this);
     close_button_->SetImage(views::CustomButton::BS_NORMAL,
         rb.GetBitmapNamed(IDR_CLOSE_BAR));
     close_button_->SetImage(views::CustomButton::BS_HOT,
         rb.GetBitmapNamed(IDR_CLOSE_BAR_H));
     close_button_->SetImage(views::CustomButton::BS_PUSHED,
         rb.GetBitmapNamed(IDR_CLOSE_BAR_P));
     AddChildView(close_button_);
   }
 
-  virtual void ButtonPressed(views::Button* sender, const views::Event& event) {
-    if (sender == close_button_)
-      bubble_->StartFade(false);
-    else
+  void set_bubble(Bubble* bubble) { bubble_ = bubble; }
+
+  virtual void ButtonPressed(
+      views::Button* sender,
+      const views::Event& event) {
+    if (sender == close_button_) {
+      bubble_->set_fade_away_on_close(true);
+      GetWidget()->Close();
+    } else {
       NOTREACHED() << "Unknown view";
+    }
   }
 
   // Implements the views::LinkListener interface.
   virtual void LinkClicked(views::Link* source, int event_flags) OVERRIDE {
     GetWidget()->Close();
     ExtensionInstallUI::OpenAppInstalledNTP(browser_, extension_id_);
   }
 
  private:
   virtual gfx::Size GetPreferredSize() {
@@ skipping 55 matching lines @@
     // title text and bubble arrow.
     close_button_->SetBounds(x - 1, y - 1, sz.width(), sz.height());
   }
 
   // The browser we're associated with.
   Browser* browser_;
 
   // The id of the extension just installed.
   const std::string extension_id_;
 
-  // The ExtensionInstalledBubble showing us.
-  ExtensionInstalledBubble* bubble_;
+  // The Bubble showing us.
+  Bubble* bubble_;
 
   ExtensionInstalledBubble::BubbleType type_;
   views::ImageView* icon_;
   views::Label* heading_;
   views::Label* info_;
   views::Label* manage_;
   views::ImageButton* close_button_;
 
   DISALLOW_COPY_AND_ASSIGN(InstalledBubbleContent);
 };
@@ skipping 59 matching lines @@
     if (extension == extension_)
       extension_ = NULL;
   } else {
     NOTREACHED() << L"Received unexpected notification";
   }
 }
 
 void ExtensionInstalledBubble::ShowInternal() {
   BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser_);
 
-  views::View* reference_view = NULL;
+  const views::View* reference_view = NULL;
   if (type_ == APP) {
     if (browser_view->IsTabStripVisible()) {
       AbstractTabStripView* tabstrip = browser_view->tabstrip();
       views::View* ntp_button = tabstrip->GetNewTabButton();
       if (ntp_button && ntp_button->IsVisibleInRootView()) {
         reference_view = ntp_button;
       } else {
         // Just have the bubble point at the tab strip.
         reference_view = tabstrip;
       }
@@ skipping 30 matching lines @@
     DCHECK(reference_view);
   } else if (type_ == OMNIBOX_KEYWORD) {
     LocationBarView* location_bar_view = browser_view->GetLocationBarView();
     reference_view = location_bar_view;
     DCHECK(reference_view);
   }
 
   // Default case.
   if (reference_view == NULL)
     reference_view = browser_view->GetToolbarView()->app_menu();
-  set_anchor_view(reference_view);
 
-  SetLayoutManager(new views::FillLayout());
-  AddChildView(
-      new InstalledBubbleContent(browser_, extension_, type_, &icon_, this));
-  views::BubbleDelegateView::CreateBubble(this);
-  StartFade(true);
-}
+  gfx::Point origin;
+  views::View::ConvertPointToScreen(reference_view, &origin);
+  gfx::Rect bounds = reference_view->bounds();
+  bounds.set_origin(origin);
+  views::BubbleBorder::ArrowLocation arrow_location =
+      views::BubbleBorder::TOP_RIGHT;
 
-gfx::Point ExtensionInstalledBubble::GetAnchorPoint() {
   // For omnibox keyword bubbles, move the arrow to point to the left edge
   // of the omnibox, just to the right of the icon.
   if (type_ == OMNIBOX_KEYWORD) {
-    LocationBarView* location_bar_view =
-        BrowserView::GetBrowserViewForBrowser(browser_)->GetLocationBarView();
-    return location_bar_view->GetLocationEntryOrigin().Add(
-        gfx::Point(0, location_bar_view->location_entry_view()->height()));
+    bounds.set_origin(
+        browser_view->GetLocationBarView()->GetLocationEntryOrigin());
+    bounds.set_width(0);
+    arrow_location = views::BubbleBorder::TOP_LEFT;
   }
-  return views::BubbleDelegateView::GetAnchorPoint();
+
+  bubble_content_ = new InstalledBubbleContent(
+      browser_, extension_, type_, &icon_);
+  Bubble* bubble = Bubble::Show(browser_view->GetWidget(), bounds,
+                                arrow_location,
+                                views::BubbleBorder::ALIGN_ARROW_TO_MID_ANCHOR,
+                                bubble_content_, this);
+  bubble_content_->set_bubble(bubble);
 }
 
-views::BubbleBorder::ArrowLocation
-    ExtensionInstalledBubble::GetArrowLocation() const {
-  return type_ == OMNIBOX_KEYWORD ? views::BubbleBorder::TOP_LEFT :
-                                    views::BubbleBorder::TOP_RIGHT;
-}
-
-void ExtensionInstalledBubble::WindowClosing() {
+// BubbleDelegate
+void ExtensionInstalledBubble::BubbleClosing(Bubble* bubble,
+                                             bool closed_by_escape) {
   if (extension_ && type_ == PAGE_ACTION) {
     BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser_);
     browser_view->GetLocationBarView()->SetPreviewEnabledPageAction(
         extension_->page_action(),
         false);  // preview_enabled
   }
 
   Release();  // Balanced in ctor.
 }
+
+bool ExtensionInstalledBubble::CloseOnEscape() {
+  return true;
+}
+
+bool ExtensionInstalledBubble::FadeInOnShow() {
+  return true;
+}