Revert 110824 - Variety of crashes on XP dbg bots

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

 // 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_EXTENSIONS_EXTENSION_INSTALLED_BUBBLE_H_
 #define CHROME_BROWSER_UI_VIEWS_EXTENSIONS_EXTENSION_INSTALLED_BUBBLE_H_
 #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
 // point to:
 //    OMNIBOX_KEYWORD-> The omnibox.
 //    BROWSER_ACTION -> The browserAction icon in the toolbar.
 //    PAGE_ACTION    -> A preview of the pageAction icon in the location
 //                      bar which is shown while the Bubble is shown.
 //    APP            -> The plus button in the tabstrip (for the New Tab Page).
 //    GENERIC        -> The wrench menu. This case includes pageActions that
 //                      don't specify a default icon.
 //
 // ExtensionInstallBubble manages its own lifetime.
 class ExtensionInstalledBubble
-    : public views::BubbleDelegateView,
+    : public BubbleDelegate,
       public content::NotificationObserver,
       public base::RefCountedThreadSafe<ExtensionInstalledBubble> {
  public:
   // The behavior and content of this Bubble comes in these varieties:
   enum BubbleType {
     OMNIBOX_KEYWORD,
     BROWSER_ACTION,
     PAGE_ACTION,
     APP,
     GENERIC
   };
 
   // Creates the ExtensionInstalledBubble and schedules it to be shown once
   // the extension has loaded. |extension| is the installed extension. |browser|
   // is the browser window which will host the bubble. |icon| is the install
   // icon of the extension.
   static void Show(
       const Extension* extension, Browser *browser, const SkBitmap& icon);
 
  private:
   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();
 
   // Shows the bubble. Called internally via PostTask.
   void ShowInternal();
 
   // content::NotificationObserver
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
-  // views::WidgetDelegate
-  virtual void WindowClosing() OVERRIDE;
-
-  // views::BubbleDelegate
-  virtual gfx::Point GetAnchorPoint() OVERRIDE;
-  virtual views::BubbleBorder::ArrowLocation GetArrowLocation() const OVERRIDE;
+  // BubbleDelegate
+  virtual void BubbleClosing(Bubble* bubble, bool closed_by_escape) OVERRIDE;
+  virtual bool CloseOnEscape() OVERRIDE;
+  virtual bool FadeInOnShow() 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.
   int animation_wait_retries_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionInstalledBubble);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_EXTENSIONS_EXTENSION_INSTALLED_BUBBLE_H_