Rename ExtensionInstalledBubble::Delegate to ExtensionInstalledBubbleUi.
BUG=496955
Review URL: https://codereview.chromium.org/1366853003
Cr-Commit-Position: refs/heads/master@{#351919}
diff --git a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm
index a6aba0a..ab849ed 100644
--- a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm
+++ b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm
@@ -51,14 +51,14 @@
using extensions::Extension;
class ExtensionInstalledBubbleBridge
- : public ExtensionInstalledBubble::Delegate {
+ : public ExtensionInstalledBubble::ExtensionInstalledBubbleUi {
public:
explicit ExtensionInstalledBubbleBridge(
ExtensionInstalledBubbleController* controller);
~ExtensionInstalledBubbleBridge() override;
private:
- // ExtensionInstalledBubble::Delegate:
+ // ExtensionInstalledBubble::ExtensionInstalledBubbleUi:
bool MaybeShowNow() override;
// The (owning) installed bubble controller.
diff --git a/chrome/browser/ui/extensions/extension_installed_bubble.cc b/chrome/browser/ui/extensions/extension_installed_bubble.cc
index 2d5d7bd..b5e98b4 100644
--- a/chrome/browser/ui/extensions/extension_installed_bubble.cc
+++ b/chrome/browser/ui/extensions/extension_installed_bubble.cc
@@ -59,11 +59,12 @@
} // namespace
-ExtensionInstalledBubble::ExtensionInstalledBubble(Delegate* delegate,
- const Extension* extension,
- Browser* browser,
- const SkBitmap& icon)
- : delegate_(delegate),
+ExtensionInstalledBubble::ExtensionInstalledBubble(
+ ExtensionInstalledBubbleUi* bubble_ui,
+ const Extension* extension,
+ Browser* browser,
+ const SkBitmap& icon)
+ : bubble_ui_(bubble_ui),
extension_(extension),
browser_(browser),
icon_(icon),
@@ -130,7 +131,7 @@
}
void ExtensionInstalledBubble::ShowInternal() {
- if (delegate_->MaybeShowNow())
+ if (bubble_ui_->MaybeShowNow())
return;
if (animation_wait_retries_++ < kAnimationWaitRetries) {
base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
@@ -172,5 +173,5 @@
const content::NotificationDetails& details) {
DCHECK_EQ(type, chrome::NOTIFICATION_BROWSER_CLOSING)
<< "Received unexpected notification";
- delete delegate_;
+ delete bubble_ui_;
}
diff --git a/chrome/browser/ui/extensions/extension_installed_bubble.h b/chrome/browser/ui/extensions/extension_installed_bubble.h
index dddf228..30d9140d 100644
--- a/chrome/browser/ui/extensions/extension_installed_bubble.h
+++ b/chrome/browser/ui/extensions/extension_installed_bubble.h
@@ -43,9 +43,9 @@
};
// Implements the UI for showing the bubble. Owns us.
- class Delegate {
+ class ExtensionInstalledBubbleUi {
public:
- virtual ~Delegate() {}
+ virtual ~ExtensionInstalledBubbleUi() {}
// Attempts to show the bubble. Called from ShowInternal. Returns false
// if, because of animating (such as from adding a new browser action
@@ -53,9 +53,9 @@
virtual bool MaybeShowNow() = 0;
};
- ExtensionInstalledBubble(Delegate* delegate,
+ ExtensionInstalledBubble(ExtensionInstalledBubbleUi* bubble_ui,
const extensions::Extension* extension,
- Browser *browser,
+ Browser* browser,
const SkBitmap& icon);
~ExtensionInstalledBubble() override;
@@ -90,8 +90,8 @@
const extensions::Extension* extension,
extensions::UnloadedExtensionInfo::Reason reason) override;
- // The view delegate that shows the bubble. Owns us.
- Delegate* delegate_;
+ // The view that shows the bubble. Owns us.
+ ExtensionInstalledBubbleUi* bubble_ui_;
// |extension_| is NULL when we are deleted.
const extensions::Extension* extension_;
diff --git a/chrome/browser/ui/views/extensions/extension_installed_bubble_view.h b/chrome/browser/ui/views/extensions/extension_installed_bubble_view.h
index 789dc65..9271f4b 100644
--- a/chrome/browser/ui/views/extensions/extension_installed_bubble_view.h
+++ b/chrome/browser/ui/views/extensions/extension_installed_bubble_view.h
@@ -25,7 +25,7 @@
// GENERIC -> The wrench menu. This case includes pageActions that
// don't specify a default icon.
class ExtensionInstalledBubbleView
- : public ExtensionInstalledBubble::Delegate,
+ : public ExtensionInstalledBubble::ExtensionInstalledBubbleUi,
public views::BubbleDelegateView {
public:
// Creates the ExtensionInstalledBubbleView and schedules it to be shown once
@@ -43,7 +43,7 @@
~ExtensionInstalledBubbleView() override;
- // ExtensionInstalledBubble::Delegate:
+ // ExtensionInstalledBubble::ExtensionInstalledBubbleUi:
bool MaybeShowNow() override;
// views::WidgetDelegate:
