Cleanup: de-inline a bunch of classes, rename and move "PluginInstaller" to "...

chrome/browser/plugin_installer_infobar_delegate.cc

Index: chrome/browser/plugin_installer_infobar_delegate.cc
===================================================================
--- chrome/browser/plugin_installer_infobar_delegate.cc	(revision 71131)
+++ chrome/browser/plugin_installer_infobar_delegate.cc	(working copy)
@@ -1,12 +1,11 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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/plugin_installer.h"
+#include "chrome/browser/plugin_installer_infobar_delegate.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
-#include "base/string_util.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "grit/generated_resources.h"
@@ -14,21 +13,18 @@
 #include "grit/theme_resources.h"
 #include "webkit/plugins/npapi/default_plugin_shared.h"
 
-// The URL for the "Problems installing" page for the Plugins infobar.
-static const char kLearnMorePluginInstallerUrl[] =
-    "http://www.google.com/support/chrome/bin/answer.py?answer=95697&topic=14687";
-
-PluginInstaller::PluginInstaller(TabContents* tab_contents)
+PluginInstallerInfoBarDelegate::PluginInstallerInfoBarDelegate(
+    TabContents* tab_contents)
     : ConfirmInfoBarDelegate(tab_contents),
       tab_contents_(tab_contents) {
 }
 
-PluginInstaller::~PluginInstaller() {
+PluginInstallerInfoBarDelegate::~PluginInstallerInfoBarDelegate() {
   // Remove any InfoBars we may be showing.
   tab_contents_->RemoveInfoBar(this);
 }
 
-void PluginInstaller::OnMissingPluginStatus(int status) {
+void PluginInstallerInfoBarDelegate::OnMissingPluginStatus(int status) {
   switch (status) {
     case webkit::npapi::default_plugin::MISSING_PLUGIN_AVAILABLE: {
       tab_contents_->AddInfoBar(this);
@@ -47,37 +43,40 @@
   }
 }
 
-string16 PluginInstaller::GetMessageText() const {
-  return l10n_util::GetStringUTF16(IDS_PLUGININSTALLER_MISSINGPLUGIN_PROMPT);
-}
-
-SkBitmap* PluginInstaller::GetIcon() const {
+SkBitmap* PluginInstallerInfoBarDelegate::GetIcon() const {
   return ResourceBundle::GetSharedInstance().GetBitmapNamed(
       IDR_INFOBAR_PLUGIN_INSTALL);
 }
 
-int PluginInstaller::GetButtons() const {
+string16 PluginInstallerInfoBarDelegate::GetMessageText() const {
+  return l10n_util::GetStringUTF16(IDS_PLUGININSTALLER_MISSINGPLUGIN_PROMPT);
+}
+
+int PluginInstallerInfoBarDelegate::GetButtons() const {
   return BUTTON_OK;
 }
 
-string16 PluginInstaller::GetButtonLabel(InfoBarButton button) const {
-  if (button == BUTTON_OK)
-    return l10n_util::GetStringUTF16(IDS_PLUGININSTALLER_INSTALLPLUGIN_BUTTON);
-  return ConfirmInfoBarDelegate::GetButtonLabel(button);
+string16 PluginInstallerInfoBarDelegate::GetButtonLabel(
+    InfoBarButton button) const {
+  DCHECK_EQ(BUTTON_OK, button);
+  return l10n_util::GetStringUTF16(IDS_PLUGININSTALLER_INSTALLPLUGIN_BUTTON);
 }
 
-bool PluginInstaller::Accept() {
+bool PluginInstallerInfoBarDelegate::Accept() {
   tab_contents_->render_view_host()->InstallMissingPlugin();
   return true;
 }
 
-string16 PluginInstaller::GetLinkText() {
+string16 PluginInstallerInfoBarDelegate::GetLinkText() {
   return l10n_util::GetStringUTF16(IDS_PLUGININSTALLER_PROBLEMSINSTALLING);
 }
 
-bool PluginInstaller::LinkClicked(WindowOpenDisposition disposition) {
+bool PluginInstallerInfoBarDelegate::LinkClicked(
+    WindowOpenDisposition disposition) {
   // Ignore the click dispostion and always open in a new top level tab.
+  static const char kLearnMorePluginInstallerUrl[] = "http://www.google.com/"
+      "support/chrome/bin/answer.py?answer=95697&topic=14687";
   tab_contents_->OpenURL(GURL(kLearnMorePluginInstallerUrl), GURL(),
                          NEW_FOREGROUND_TAB, PageTransition::LINK);
-  return false;  // Do not dismiss the info bar.
+  return false;
 }