Move version metadata from PluginGroup into PluginInstaller.

chrome/browser/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/plugin_infobar_delegates.h"
 
 #include "base/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_tab_helper.h"
@@ skipping 132 matching lines @@
 }
 
 #if defined(ENABLE_PLUGIN_INSTALLATION)
 // OutdatedPluginInfoBarDelegate ----------------------------------------------
 
 InfoBarDelegate* OutdatedPluginInfoBarDelegate::Create(
     PluginObserver* observer,
     PluginInstaller* installer) {
   string16 message;
   switch (installer->state()) {
-    case PluginInstaller::kStateIdle:

[jochen (gone - plz use gerrit), 2012/05/18 18:48:18]

any reason you change this instead of making the security state constants k...
as well? Especially since in the test you re-define the security state contants
to k... again?

[Bernhard Bauer, 2012/05/21 10:52:27]

The Chromium style (http://dev.chromium.org/developers/coding-style#Naming) says
to use MACRO_STYLE for enums (and in the test I need to redeclare them anyway to
get rid of the PluginInstaller:: prefix).

+    case PluginInstaller::INSTALLER_STATE_IDLE:
       message = l10n_util::GetStringFUTF16(IDS_PLUGIN_OUTDATED_PROMPT,
                                            installer->name());
       break;
-    case PluginInstaller::kStateDownloading:
+    case PluginInstaller::INSTALLER_STATE_DOWNLOADING:
       message = l10n_util::GetStringFUTF16(IDS_PLUGIN_DOWNLOADING,
                                            installer->name());
       break;
   }
   return new OutdatedPluginInfoBarDelegate(
       observer, installer, message);
 }
 
 OutdatedPluginInfoBarDelegate::OutdatedPluginInfoBarDelegate(
     PluginObserver* observer,
@@ skipping 41 matching lines @@
 }
 
 string16 OutdatedPluginInfoBarDelegate::GetButtonLabel(
     InfoBarButton button) const {
   return l10n_util::GetStringUTF16((button == BUTTON_OK) ?
       IDS_PLUGIN_UPDATE : IDS_PLUGIN_ENABLE_TEMPORARILY);
 }
 
 bool OutdatedPluginInfoBarDelegate::Accept() {
   content::RecordAction(UserMetricsAction("OutdatedPluginInfobar.Update"));
-  if (installer()->state() != PluginInstaller::kStateIdle) {
+  if (installer()->state() != PluginInstaller::INSTALLER_STATE_IDLE) {
     NOTREACHED();
     return false;
   }
 
   content::WebContents* web_contents = owner()->web_contents();
   if (installer()->url_for_display()) {
     installer()->OpenDownloadURL(web_contents);
   } else {
     installer()->StartInstalling(observer_->tab_contents_wrapper());
   }
@@ skipping 77 matching lines @@
 PluginInstallerInfoBarDelegate::~PluginInstallerInfoBarDelegate() {
 }
 
 InfoBarDelegate* PluginInstallerInfoBarDelegate::Create(
     InfoBarTabHelper* infobar_helper,
     PluginInstaller* installer,
     const base::Closure& callback) {
   string16 message;
   const string16& plugin_name = installer->name();
   switch (installer->state()) {
-    case PluginInstaller::kStateIdle:
+    case PluginInstaller::INSTALLER_STATE_IDLE:
       message = l10n_util::GetStringFUTF16(
           IDS_PLUGININSTALLER_INSTALLPLUGIN_PROMPT, plugin_name);
       break;
-    case PluginInstaller::kStateDownloading:
+    case PluginInstaller::INSTALLER_STATE_DOWNLOADING:
       message = l10n_util::GetStringFUTF16(IDS_PLUGIN_DOWNLOADING, plugin_name);
       break;
   }
   return new PluginInstallerInfoBarDelegate(
       infobar_helper, installer, callback, true, message);
 }
 
 gfx::Image* PluginInstallerInfoBarDelegate::GetIcon() const {
   return &ResourceBundle::GetSharedInstance().GetNativeImageNamed(
       IDR_INFOBAR_PLUGIN_INSTALL);
@@ skipping 74 matching lines @@
   // keep replacing infobar delegates infinitely).
   if (message_ == message)
     return;
   if (!owner())
     return;
   InfoBarDelegate* delegate = new PluginInstallerInfoBarDelegate(
       owner(), installer(), base::Closure(), new_install_, message);
   owner()->ReplaceInfoBar(this, delegate);
 }
 #endif  // defined(ENABLE_PLUGIN_INSTALLATION)