Revert 238283 "Infobar system refactor."

trunk/src/chrome/browser/plugins/plugin_infobar_delegates.cc

 // Copyright (c) 2012 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/plugins/plugin_infobar_delegates.h"
 
 #include "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/google/google_util.h"
-#include "chrome/browser/infobars/infobar.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/plugins/chrome_plugin_service_filter.h"
 #include "chrome/browser/plugins/plugin_metadata.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_thread.h"
@@ skipping 20 matching lines @@
 #if defined(USE_AURA)
 #include "ui/aura/remote_root_window_host_win.h"
 #endif
 #endif
 
 using content::UserMetricsAction;
 
 
 // PluginInfoBarDelegate ------------------------------------------------------
 
-PluginInfoBarDelegate::PluginInfoBarDelegate(const std::string& identifier)
-    : ConfirmInfoBarDelegate(),
+PluginInfoBarDelegate::PluginInfoBarDelegate(InfoBarService* infobar_service,
+                                             const std::string& identifier)
+    : ConfirmInfoBarDelegate(infobar_service),
       identifier_(identifier) {
 }
 
 PluginInfoBarDelegate::~PluginInfoBarDelegate() {
 }
 
 bool PluginInfoBarDelegate::LinkClicked(WindowOpenDisposition disposition) {
   web_contents()->OpenURL(content::OpenURLParams(
       GURL(GetLearnMoreURL()), content::Referrer(),
       (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition,
@@ skipping 19 matching lines @@
 
 
 // UnauthorizedPluginInfoBarDelegate ------------------------------------------
 
 // static
 void UnauthorizedPluginInfoBarDelegate::Create(
     InfoBarService* infobar_service,
     HostContentSettingsMap* content_settings,
     const string16& name,
     const std::string& identifier) {
-  infobar_service->AddInfoBar(ConfirmInfoBarDelegate::CreateInfoBar(
-      scoped_ptr<ConfirmInfoBarDelegate>(new UnauthorizedPluginInfoBarDelegate(
-          content_settings, name, identifier))));
+  infobar_service->AddInfoBar(scoped_ptr<InfoBarDelegate>(
+      new UnauthorizedPluginInfoBarDelegate(infobar_service, content_settings,
+                                            name, identifier)));
 
   content::RecordAction(UserMetricsAction("BlockedPluginInfobar.Shown"));
   std::string utf8_name(UTF16ToUTF8(name));
   if (utf8_name == PluginMetadata::kJavaGroupName) {
     content::RecordAction(UserMetricsAction("BlockedPluginInfobar.Shown.Java"));
   } else if (utf8_name == PluginMetadata::kQuickTimeGroupName) {
     content::RecordAction(
         UserMetricsAction("BlockedPluginInfobar.Shown.QuickTime"));
   } else if (utf8_name == PluginMetadata::kShockwaveGroupName) {
     content::RecordAction(
         UserMetricsAction("BlockedPluginInfobar.Shown.Shockwave"));
   } else if (utf8_name == PluginMetadata::kRealPlayerGroupName) {
     content::RecordAction(
         UserMetricsAction("BlockedPluginInfobar.Shown.RealPlayer"));
   } else if (utf8_name == PluginMetadata::kWindowsMediaPlayerGroupName) {
     content::RecordAction(
         UserMetricsAction("BlockedPluginInfobar.Shown.WindowsMediaPlayer"));
   }
 }
 
 UnauthorizedPluginInfoBarDelegate::UnauthorizedPluginInfoBarDelegate(
+    InfoBarService* infobar_service,
     HostContentSettingsMap* content_settings,
     const string16& name,
     const std::string& identifier)
-    : PluginInfoBarDelegate(identifier),
+    : PluginInfoBarDelegate(infobar_service, identifier),
       content_settings_(content_settings),
       name_(name) {
 }
 
 UnauthorizedPluginInfoBarDelegate::~UnauthorizedPluginInfoBarDelegate() {
   content::RecordAction(UserMetricsAction("BlockedPluginInfobar.Closed"));
 }
 
 std::string UnauthorizedPluginInfoBarDelegate::GetLearnMoreURL() const {
   return chrome::kBlockedPluginLearnMoreURL;
@@ skipping 40 matching lines @@
 
 // OutdatedPluginInfoBarDelegate ----------------------------------------------
 
 void OutdatedPluginInfoBarDelegate::Create(
     InfoBarService* infobar_service,
     PluginInstaller* installer,
     scoped_ptr<PluginMetadata> plugin_metadata) {
   // Copy the name out of |plugin_metadata| now, since the Pass() call below
   // will make it impossible to get at.
   string16 name(plugin_metadata->name());
-  infobar_service->AddInfoBar(ConfirmInfoBarDelegate::CreateInfoBar(
-      scoped_ptr<ConfirmInfoBarDelegate>(new OutdatedPluginInfoBarDelegate(
-          installer, plugin_metadata.Pass(), l10n_util::GetStringFUTF16(
+  infobar_service->AddInfoBar(scoped_ptr<InfoBarDelegate>(
+      new OutdatedPluginInfoBarDelegate(
+          infobar_service, installer, plugin_metadata.Pass(),
+          l10n_util::GetStringFUTF16(
               (installer->state() == PluginInstaller::INSTALLER_STATE_IDLE) ?
                   IDS_PLUGIN_OUTDATED_PROMPT : IDS_PLUGIN_DOWNLOADING,
-              name)))));
+              name))));
 }
 
 OutdatedPluginInfoBarDelegate::OutdatedPluginInfoBarDelegate(
+    InfoBarService* infobar_service,
     PluginInstaller* installer,
     scoped_ptr<PluginMetadata> plugin_metadata,
     const string16& message)
-    : PluginInfoBarDelegate(plugin_metadata->identifier()),
+    : PluginInfoBarDelegate(infobar_service, plugin_metadata->identifier()),
       WeakPluginInstallerObserver(installer),
       plugin_metadata_(plugin_metadata.Pass()),
       message_(message) {
   content::RecordAction(UserMetricsAction("OutdatedPluginInfobar.Shown"));
   std::string name = UTF16ToUTF8(plugin_metadata_->name());
   if (name == PluginMetadata::kJavaGroupName) {
     content::RecordAction(
         UserMetricsAction("OutdatedPluginInfobar.Shown.Java"));
   } else if (name == PluginMetadata::kQuickTimeGroupName) {
     content::RecordAction(
@@ skipping 76 matching lines @@
   ReplaceWithInfoBar(l10n_util::GetStringFUTF16(IDS_PLUGIN_DOWNLOAD_CANCELLED,
                                                 plugin_metadata_->name()));
 }
 
 void OutdatedPluginInfoBarDelegate::DownloadFinished() {
   ReplaceWithInfoBar(l10n_util::GetStringFUTF16(IDS_PLUGIN_UPDATING,
                                                 plugin_metadata_->name()));
 }
 
 void OutdatedPluginInfoBarDelegate::OnlyWeakObserversLeft() {
-  infobar()->RemoveSelf();
+  if (owner())
+    owner()->RemoveInfoBar(this);
 }
 
 void OutdatedPluginInfoBarDelegate::ReplaceWithInfoBar(
     const string16& message) {
   // Return early if the message doesn't change. This is important in case the
   // PluginInstaller is still iterating over its observers (otherwise we would
   // keep replacing infobar delegates infinitely).
-  if ((message_ == message) || !infobar()->owner())
+  if ((message_ == message) || !owner())
     return;
   PluginInstallerInfoBarDelegate::Replace(
-      infobar(), installer(), plugin_metadata_->Clone(), false, message);
+      this, installer(), plugin_metadata_->Clone(), false, message);
 }
 
 
 // PluginInstallerInfoBarDelegate ---------------------------------------------
 
 void PluginInstallerInfoBarDelegate::Create(
     InfoBarService* infobar_service,
     PluginInstaller* installer,
     scoped_ptr<PluginMetadata> plugin_metadata,
     const InstallCallback& callback) {
   string16 name(plugin_metadata->name());
 #if defined(OS_WIN)
   if (base::win::IsMetroProcess()) {
     PluginMetroModeInfoBarDelegate::Create(
         infobar_service, PluginMetroModeInfoBarDelegate::MISSING_PLUGIN, name);
     return;
   }
 #endif
-  infobar_service->AddInfoBar(ConfirmInfoBarDelegate::CreateInfoBar(
-      scoped_ptr<ConfirmInfoBarDelegate>(new PluginInstallerInfoBarDelegate(
-          installer, plugin_metadata.Pass(), callback, true,
+  infobar_service->AddInfoBar(scoped_ptr<InfoBarDelegate>(
+      new PluginInstallerInfoBarDelegate(
+          infobar_service, installer, plugin_metadata.Pass(), callback, true,
           l10n_util::GetStringFUTF16(
               (installer->state() == PluginInstaller::INSTALLER_STATE_IDLE) ?
                   IDS_PLUGININSTALLER_INSTALLPLUGIN_PROMPT :
                   IDS_PLUGIN_DOWNLOADING,
-              name)))));
+              name))));
+
 }
 
-
 void PluginInstallerInfoBarDelegate::Replace(
-    InfoBar* infobar,
+    InfoBarDelegate* infobar,
     PluginInstaller* installer,
     scoped_ptr<PluginMetadata> plugin_metadata,
     bool new_install,
     const string16& message) {
   DCHECK(infobar->owner());
-  infobar->owner()->ReplaceInfoBar(infobar,
-      ConfirmInfoBarDelegate::CreateInfoBar(scoped_ptr<ConfirmInfoBarDelegate>(
-          new PluginInstallerInfoBarDelegate(
-              installer, plugin_metadata.Pass(),
-              PluginInstallerInfoBarDelegate::InstallCallback(), new_install,
-              message))));
+  infobar->owner()->ReplaceInfoBar(infobar, scoped_ptr<InfoBarDelegate>(
+      new PluginInstallerInfoBarDelegate(
+          infobar->owner(), installer, plugin_metadata.Pass(),
+          PluginInstallerInfoBarDelegate::InstallCallback(), new_install,
+          message)));
 }
 
 PluginInstallerInfoBarDelegate::PluginInstallerInfoBarDelegate(
+    InfoBarService* infobar_service,
     PluginInstaller* installer,
     scoped_ptr<PluginMetadata> plugin_metadata,
     const InstallCallback& callback,
     bool new_install,
     const string16& message)
-    : ConfirmInfoBarDelegate(),
+    : ConfirmInfoBarDelegate(infobar_service),
       WeakPluginInstallerObserver(installer),
       plugin_metadata_(plugin_metadata.Pass()),
       callback_(callback),
       new_install_(new_install),
       message_(message) {
 }
 
 PluginInstallerInfoBarDelegate::~PluginInstallerInfoBarDelegate() {
 }
 
@@ skipping 56 matching lines @@
 }
 
 void PluginInstallerInfoBarDelegate::DownloadFinished() {
   ReplaceWithInfoBar(
       l10n_util::GetStringFUTF16(
           new_install_ ? IDS_PLUGIN_INSTALLING : IDS_PLUGIN_UPDATING,
           plugin_metadata_->name()));
 }
 
 void PluginInstallerInfoBarDelegate::OnlyWeakObserversLeft() {
-  infobar()->RemoveSelf();
+  if (owner())
+    owner()->RemoveInfoBar(this);
 }
 
 void PluginInstallerInfoBarDelegate::ReplaceWithInfoBar(
     const string16& message) {
   // Return early if the message doesn't change. This is important in case the
   // PluginInstaller is still iterating over its observers (otherwise we would
   // keep replacing infobar delegates infinitely).
-  if ((message_ == message) || !infobar()->owner())
+  if ((message_ == message) || !owner())
     return;
-  Replace(infobar(), installer(), plugin_metadata_->Clone(), new_install_,
-          message);
+  Replace(this, installer(), plugin_metadata_->Clone(), new_install_, message);
 }
 
 
 #if defined(OS_WIN)
 
 // PluginMetroModeInfoBarDelegate ---------------------------------------------
 
 // static
 void PluginMetroModeInfoBarDelegate::Create(
     InfoBarService* infobar_service,
     PluginMetroModeInfoBarDelegate::Mode mode,
     const string16& name) {
-  infobar_service->AddInfoBar(ConfirmInfoBarDelegate::CreateInfoBar(
-      scoped_ptr<ConfirmInfoBarDelegate>(
-          new PluginMetroModeInfoBarDelegate(mode, name))));
+  infobar_service->AddInfoBar(scoped_ptr<InfoBarDelegate>(
+      new PluginMetroModeInfoBarDelegate(infobar_service, mode, name)));
 }
 
 PluginMetroModeInfoBarDelegate::PluginMetroModeInfoBarDelegate(
+    InfoBarService* infobar_service,
     PluginMetroModeInfoBarDelegate::Mode mode,
     const string16& name)
-    : ConfirmInfoBarDelegate(),
+    : ConfirmInfoBarDelegate(infobar_service),
       mode_(mode),
       name_(name) {
 }
 
 PluginMetroModeInfoBarDelegate::~PluginMetroModeInfoBarDelegate() {
 }
 
 int PluginMetroModeInfoBarDelegate::GetIconID() const {
   return IDR_INFOBAR_PLUGIN_INSTALL;
 }
@@ skipping 53 matching lines @@
           "https://support.google.com/chrome/?p=ib_redirect_to_desktop"),
       content::Referrer(),
       (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition,
       content::PAGE_TRANSITION_LINK, false));
   return false;
 }
 
 #endif  // defined(OS_WIN)
 
 #endif  // defined(ENABLE_PLUGIN_INSTALLATION)