Change infobar creation to use a public static Create() method on the infobar delegate classes.

chrome/browser/plugins/plugin_observer.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_observer.h"
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/stl_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 14 matching lines @@
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "webkit/plugins/webplugininfo.h"
 
 #if defined(ENABLE_PLUGIN_INSTALLATION)
+#if defined(OS_WIN)
+#include "base/win/metro.h"
+#endif
 #include "chrome/browser/plugins/plugin_installer.h"
 #include "chrome/browser/plugins/plugin_installer_observer.h"
 #include "chrome/browser/ui/tab_modal_confirm_dialog_delegate.h"
 #endif  // defined(ENABLE_PLUGIN_INSTALLATION)
 
-#if defined(OS_WIN)
-#include "base/win/metro.h"
-#endif
-
 using content::OpenURLParams;
 using content::PluginService;
 using content::Referrer;
 using content::WebContents;
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(PluginObserver);
 
 namespace {
 
 #if defined(ENABLE_PLUGIN_INSTALLATION)
@@ skipping 128 matching lines @@
 #endif
 }
 
 void PluginObserver::PluginCrashed(const FilePath& plugin_path) {
   DCHECK(!plugin_path.value().empty());
 
   string16 plugin_name =
       PluginService::GetInstance()->GetPluginDisplayNameByPath(plugin_path);
   gfx::Image* icon = &ResourceBundle::GetSharedInstance().GetNativeImageNamed(
       IDR_INFOBAR_PLUGIN_CRASHED);
-  InfoBarService* infobar_service =
-      InfoBarService::FromWebContents(web_contents());
-  infobar_service->AddInfoBar(
-      new SimpleAlertInfoBarDelegate(
-          infobar_service,
-          icon,
-          l10n_util::GetStringFUTF16(IDS_PLUGIN_CRASHED_PROMPT, plugin_name),
-          true));
+  SimpleAlertInfoBarDelegate::Create(
+      InfoBarService::FromWebContents(web_contents()), icon,
+      l10n_util::GetStringFUTF16(IDS_PLUGIN_CRASHED_PROMPT, plugin_name), true);
 }
 
 bool PluginObserver::OnMessageReceived(const IPC::Message& message) {
   IPC_BEGIN_MESSAGE_MAP(PluginObserver, message)
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_BlockedOutdatedPlugin,
                         OnBlockedOutdatedPlugin)
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_BlockedUnauthorizedPlugin,
                         OnBlockedUnauthorizedPlugin)
 #if defined(ENABLE_PLUGIN_INSTALLATION)
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_FindMissingPlugin,
@@ skipping 10 matching lines @@
 
     IPC_MESSAGE_UNHANDLED(return false)
   IPC_END_MESSAGE_MAP()
 
   return true;
 }
 
 void PluginObserver::OnBlockedUnauthorizedPlugin(
     const string16& name,
     const std::string& identifier) {
-  InfoBarService* infobar_service =
-      InfoBarService::FromWebContents(web_contents());
-  infobar_service->AddInfoBar(
-      new UnauthorizedPluginInfoBarDelegate(
-          infobar_service,
-          Profile::FromBrowserContext(web_contents()->GetBrowserContext())->
-              GetHostContentSettingsMap(),
-          name, identifier));
+  UnauthorizedPluginInfoBarDelegate::Create(
+      InfoBarService::FromWebContents(web_contents()),
+      Profile::FromBrowserContext(web_contents()->GetBrowserContext())->
+          GetHostContentSettingsMap(),
+      name, identifier);
 }
 
 void PluginObserver::OnBlockedOutdatedPlugin(int placeholder_id,
                                              const std::string& identifier) {
 #if defined(ENABLE_PLUGIN_INSTALLATION)
   PluginFinder* finder = PluginFinder::GetInstance();
   // Find plugin to update.
   PluginInstaller* installer = NULL;
   scoped_ptr<PluginMetadata> plugin;
   if (!finder->FindPluginWithIdentifier(identifier, &installer, &plugin)) {
     NOTREACHED();
     return;
   }
 
   plugin_placeholders_[placeholder_id] =
       new PluginPlaceholderHost(this, placeholder_id,
                                 plugin->name(), installer);
-  InfoBarService* infobar_service =
-      InfoBarService::FromWebContents(web_contents());
-  infobar_service->AddInfoBar(
-      OutdatedPluginInfoBarDelegate::Create(web_contents(),
-                                            installer, plugin.Pass()));
+  OutdatedPluginInfoBarDelegate::Create(
+      InfoBarService::FromWebContents(web_contents()), installer,
+      plugin.Pass());
 #else
   // If we don't support third-party plug-in installation, we shouldn't have
   // outdated plug-ins.
   NOTREACHED();
 #endif  // defined(ENABLE_PLUGIN_INSTALLATION)
 }
 
 #if defined(ENABLE_PLUGIN_INSTALLATION)
 void PluginObserver::OnFindMissingPlugin(int placeholder_id,
                                          const std::string& mime_type) {
   std::string lang = "en-US";  // Oh yes.
   scoped_ptr<PluginMetadata> plugin_metadata;
   PluginInstaller* installer = NULL;
   bool found_plugin = PluginFinder::GetInstance()->FindPlugin(
       mime_type, lang, &installer, &plugin_metadata);
   if (!found_plugin) {
     Send(new ChromeViewMsg_DidNotFindMissingPlugin(placeholder_id));
     return;
   }
   DCHECK(installer);
   DCHECK(plugin_metadata.get());
 
   plugin_placeholders_[placeholder_id] =
       new PluginPlaceholderHost(this, placeholder_id,
                                 plugin_metadata->name(),
                                 installer);
-  PluginInstallerInfoBarDelegate::InstallCallback callback =
+  PluginInstallerInfoBarDelegate::Create(
+      InfoBarService::FromWebContents(web_contents()), installer,
+      plugin_metadata.Pass(),
       base::Bind(&PluginObserver::InstallMissingPlugin,
-                 weak_ptr_factory_.GetWeakPtr(), installer);
-  InfoBarService* infobar_service =
-      InfoBarService::FromWebContents(web_contents());
-  InfoBarDelegate* delegate;
-#if !defined(OS_WIN)
-  delegate = PluginInstallerInfoBarDelegate::Create(
-      infobar_service, installer, plugin_metadata.Pass(), callback);
-#else
-  delegate = base::win::IsMetroProcess() ?
-      new PluginMetroModeInfoBarDelegate(
-          infobar_service,
-          PluginMetroModeInfoBarDelegate::MISSING_PLUGIN,
-          plugin_metadata->name()) :
-      PluginInstallerInfoBarDelegate::Create(
-          infobar_service, installer, plugin_metadata.Pass(), callback);
-#endif
-  infobar_service->AddInfoBar(delegate);
+                 weak_ptr_factory_.GetWeakPtr(), installer));
 }
 
 void PluginObserver::InstallMissingPlugin(
     PluginInstaller* installer,
     const PluginMetadata* plugin_metadata) {
   if (plugin_metadata->url_for_display()) {
     installer->OpenDownloadURL(plugin_metadata->plugin_url(), web_contents());
   } else {
     TabModalConfirmDialog::Create(
         new ConfirmInstallDialogDelegate(
@@ skipping 19 matching lines @@
       GURL(chrome::kAboutPluginsURL),
       content::Referrer(web_contents()->GetURL(),
                         WebKit::WebReferrerPolicyDefault),
       NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_AUTO_BOOKMARK, false));
 }
 
 void PluginObserver::OnCouldNotLoadPlugin(const FilePath& plugin_path) {
   g_browser_process->metrics_service()->LogPluginLoadingError(plugin_path);
   string16 plugin_name =
       PluginService::GetInstance()->GetPluginDisplayNameByPath(plugin_path);
-  InfoBarService* infobar_service =
-      InfoBarService::FromWebContents(web_contents());
-  infobar_service->AddInfoBar(new SimpleAlertInfoBarDelegate(
-      infobar_service,
+  SimpleAlertInfoBarDelegate::Create(
+      InfoBarService::FromWebContents(web_contents()),
       &ResourceBundle::GetSharedInstance().GetNativeImageNamed(
           IDR_INFOBAR_PLUGIN_CRASHED),
       l10n_util::GetStringFUTF16(IDS_PLUGIN_INITIALIZATION_ERROR_PROMPT,
                                  plugin_name),
-      true  /* auto_expire */));
+      true  /* auto_expire */);
 }
 
 void PluginObserver::OnNPAPINotSupported(const std::string& identifier) {
 #if defined(OS_WIN) && defined(ENABLE_PLUGIN_INSTALLATION)
   DCHECK(base::win::IsMetroProcess());
   Profile* profile =
       Profile::FromBrowserContext(web_contents()->GetBrowserContext());
   if (profile->IsOffTheRecord())
     return;
   HostContentSettingsMap* content_settings =
       profile->GetHostContentSettingsMap();
   if (content_settings->GetContentSetting(
       web_contents()->GetURL(),
       web_contents()->GetURL(),
       CONTENT_SETTINGS_TYPE_METRO_SWITCH_TO_DESKTOP,
       std::string()) == CONTENT_SETTING_BLOCK)
     return;
 
   scoped_ptr<PluginMetadata> plugin;
   if (!PluginFinder::GetInstance()->FindPluginWithIdentifier(
           identifier, NULL, &plugin)) {
     NOTREACHED();
     return;
   }
 
-  InfoBarService* infobar_service =
-      InfoBarService::FromWebContents(web_contents());
-  infobar_service->AddInfoBar(
-      new PluginMetroModeInfoBarDelegate(
-          infobar_service,
-          PluginMetroModeInfoBarDelegate::DESKTOP_MODE_REQUIRED,
-          plugin->name()));
+  PluginMetroModeInfoBarDelegate::Create(
+      InfoBarService::FromWebContents(web_contents()),
+      PluginMetroModeInfoBarDelegate::DESKTOP_MODE_REQUIRED, plugin->name());
 #else
   NOTREACHED();
 #endif
 }