Revert 110824 - Variety of crashes on XP dbg bots

chrome/browser/ui/views/extensions/extension_installed_bubble.h

Index: chrome/browser/ui/views/extensions/extension_installed_bubble.h
===================================================================
--- chrome/browser/ui/views/extensions/extension_installed_bubble.h	(revision 110830)
+++ chrome/browser/ui/views/extensions/extension_installed_bubble.h	(working copy)
@@ -7,13 +7,15 @@
 #pragma once
 
 #include "base/memory/ref_counted.h"
+#include "chrome/browser/ui/views/bubble/bubble.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "third_party/skia/include/core/SkBitmap.h"
-#include "ui/views/bubble/bubble_delegate.h"
 
 class Browser;
 class Extension;
+class InstalledBubbleContent;
+class SkBitmap;
 
 // Provides feedback to the user upon successful installation of an
 // extension. Depending on the type of extension, the Bubble will
@@ -28,7 +30,7 @@
 //
 // ExtensionInstallBubble manages its own lifetime.
 class ExtensionInstalledBubble
-    : public views::BubbleDelegateView,
+    : public BubbleDelegate,
       public content::NotificationObserver,
       public base::RefCountedThreadSafe<ExtensionInstalledBubble> {
  public:
@@ -52,9 +54,8 @@
   friend class base::RefCountedThreadSafe<ExtensionInstalledBubble>;
 
   // Private ctor. Registers a listener for EXTENSION_LOADED.
-  ExtensionInstalledBubble(const Extension* extension,
-                           Browser *browser,
-                           const SkBitmap& icon);
+  ExtensionInstalledBubble(
+      const Extension* extension, Browser *browser, const SkBitmap& icon);
 
   virtual ~ExtensionInstalledBubble();
 
@@ -66,17 +67,16 @@
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
-  // views::WidgetDelegate
-  virtual void WindowClosing() OVERRIDE;
+  // BubbleDelegate
+  virtual void BubbleClosing(Bubble* bubble, bool closed_by_escape) OVERRIDE;
+  virtual bool CloseOnEscape() OVERRIDE;
+  virtual bool FadeInOnShow() OVERRIDE;
 
-  // views::BubbleDelegate
-  virtual gfx::Point GetAnchorPoint() OVERRIDE;
-  virtual views::BubbleBorder::ArrowLocation GetArrowLocation() const OVERRIDE;
-
   const Extension* extension_;
   Browser* browser_;
   SkBitmap icon_;
   content::NotificationRegistrar registrar_;
+  InstalledBubbleContent* bubble_content_;
   BubbleType type_;
 
   // How many times we've deferred due to animations being in progress.