Index: chrome/browser/ui/views/extensions/extension_installed_bubble_view.h |
diff --git a/chrome/browser/ui/views/extensions/extension_installed_bubble.h b/chrome/browser/ui/views/extensions/extension_installed_bubble_view.h |
similarity index 51% |
rename from chrome/browser/ui/views/extensions/extension_installed_bubble.h |
rename to chrome/browser/ui/views/extensions/extension_installed_bubble_view.h |
index 5632209eb49bc4d7e6a6ff2f6583215bacd2e238..df6c20b75d3c2415074f13476bf50a6d68e08d18 100644 |
--- a/chrome/browser/ui/views/extensions/extension_installed_bubble.h |
+++ b/chrome/browser/ui/views/extensions/extension_installed_bubble_view.h |
@@ -2,13 +2,11 @@ |
// 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_ |
+#ifndef CHROME_BROWSER_UI_VIEWS_EXTENSIONS_EXTENSION_INSTALLED_BUBBLE_VIEW_H_ |
+#define CHROME_BROWSER_UI_VIEWS_EXTENSIONS_EXTENSION_INSTALLED_BUBBLE_VIEW_H_ |
-#include "base/memory/weak_ptr.h" |
-#include "content/public/browser/notification_observer.h" |
-#include "content/public/browser/notification_registrar.h" |
-#include "third_party/skia/include/core/SkBitmap.h" |
+#include "base/compiler_specific.h" |
+#include "chrome/browser/ui/extensions/extension_installed_bubble.h" |
#include "ui/views/bubble/bubble_delegate.h" |
class Browser; |
@@ -26,19 +24,11 @@ class Extension; |
// bar which is shown while the Bubble is shown. |
// GENERIC -> The wrench menu. This case includes pageActions that |
// don't specify a default icon. |
-class ExtensionInstalledBubble |
- : public views::BubbleDelegateView, |
- public content::NotificationObserver { |
+class ExtensionInstalledBubbleView |
+ : public ExtensionInstalledBubble, |
+ public views::BubbleDelegateView { |
public: |
- // The behavior and content of this Bubble comes in these varieties: |
- enum BubbleType { |
- OMNIBOX_KEYWORD = 0, |
- BROWSER_ACTION, |
- PAGE_ACTION, |
- GENERIC, |
- }; |
- |
- // Creates the ExtensionInstalledBubble and schedules it to be shown once |
+ // Creates the ExtensionInstalledBubbleView 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. |
@@ -47,20 +37,14 @@ class ExtensionInstalledBubble |
const SkBitmap& icon); |
private: |
- // Private ctor. Registers a listener for EXTENSION_LOADED. |
- ExtensionInstalledBubble(const extensions::Extension* extension, |
- Browser *browser, |
- const SkBitmap& icon); |
+ ExtensionInstalledBubbleView(const extensions::Extension* extension, |
+ Browser *browser, |
+ const SkBitmap& icon); |
- virtual ~ExtensionInstalledBubble(); |
+ virtual ~ExtensionInstalledBubbleView(); |
// 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; |
+ virtual void ShowInternal() OVERRIDE; |
// views::WidgetDelegate |
virtual void WindowClosing() OVERRIDE; |
@@ -68,18 +52,7 @@ class ExtensionInstalledBubble |
// views::BubbleDelegate |
virtual gfx::Rect GetAnchorRect() OVERRIDE; |
- const extensions::Extension* extension_; |
- Browser* browser_; |
- SkBitmap icon_; |
- content::NotificationRegistrar registrar_; |
- BubbleType type_; |
- |
- // How many times we've deferred due to animations being in progress. |
- int animation_wait_retries_; |
- |
- base::WeakPtrFactory<ExtensionInstalledBubble> weak_factory_; |
- |
- DISALLOW_COPY_AND_ASSIGN(ExtensionInstalledBubble); |
+ DISALLOW_COPY_AND_ASSIGN(ExtensionInstalledBubbleView); |
}; |
-#endif // CHROME_BROWSER_UI_VIEWS_EXTENSIONS_EXTENSION_INSTALLED_BUBBLE_H_ |
+#endif // CHROME_BROWSER_UI_VIEWS_EXTENSIONS_EXTENSION_INSTALLED_BUBBLE_VIEW_H_ |