Re-land 5929 (r5882) with crash fix and also this change:

http://codereview.chromium.org/11392/show

which fixes the remainder of the UI test issues apparently.

http://crbug.com/4620


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5954 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 12 insertions, 23 deletions

diff --git a/chrome/browser/plugin_installer.h b/chrome/browser/plugin_installer.h
index e2d21e9..a3b479a 100644
--- a/chrome/browser/plugin_installer.h
+++ b/chrome/browser/plugin_installer.h
@@ -2,17 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_PLUGIN_INSTALLER_H__
-#define CHROME_BROWSER_PLUGIN_INSTALLER_H__
+#ifndef CHROME_BROWSER_PLUGIN_INSTALLER_H_
+#define CHROME_BROWSER_PLUGIN_INSTALLER_H_
 
-#include "base/scoped_ptr.h"
-#include "chrome/browser/views/info_bar_confirm_view.h"
-#include "chrome/browser/web_contents.h"
-#include "chrome/browser/webdata/web_data_service.h"
+#include "chrome/browser/infobar_delegate.h"
+
+class WebContents;
 
 // The main purpose for this class is to popup/close the infobar when there is
 // a missing plugin.
-class PluginInstaller {
+class PluginInstaller : public ConfirmInfoBarDelegate {
  public:
   explicit PluginInstaller(WebContents* web_contents);
   ~PluginInstaller();
@@ -20,26 +19,16 @@ class PluginInstaller {
   void OnMissingPluginStatus(int status);
   // A new page starts loading. This is the perfect time to close the info bar.
   void OnStartLoading();
-  void OnBarDestroy(InfoBarConfirmView* bar);
-  void OnOKButtonPressed();
  private:
-  class PluginInstallerBar : public InfoBarConfirmView {
-   public:
-    PluginInstallerBar(PluginInstaller* plugin_installer);
-    virtual ~PluginInstallerBar();
-
-    // InfoBarConfirmView overrides.
-    virtual void OKButtonPressed();
-
-   private:
-    PluginInstaller* plugin_installer_;
-
-    DISALLOW_EVIL_CONSTRUCTORS(PluginInstallerBar);
-  };
+  // Overridden from ConfirmInfoBarDelegate:
+  virtual std::wstring GetMessageText() const;
+  virtual SkBitmap* GetIcon() const;
+  virtual int GetButtons() const;
+  virtual std::wstring GetButtonLabel(InfoBarButton button) const;
+  virtual void Accept();
 
   // The containing WebContents
   WebContents* web_contents_;
-  InfoBarItemView* current_bar_;
 
   DISALLOW_EVIL_CONSTRUCTORS(PluginInstaller);
 };