For the Metro mode infobar, move various variables from the caller side to the

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/utf_string_conversions.h"
 #include "chrome/browser/api/infobars/infobar_service.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/google/google_util.h"
@@ skipping 420 matching lines @@
   InfoBarDelegate* delegate = new PluginInstallerInfoBarDelegate(
       owner(), installer(), plugin_metadata_->Clone(),
       InstallCallback(), new_install_, message);
   owner()->ReplaceInfoBar(this, delegate);
 }
 
 // PluginMetroModeInfoBarDelegate ---------------------------------------------
 #if defined(OS_WIN)
 PluginMetroModeInfoBarDelegate::PluginMetroModeInfoBarDelegate(
     InfoBarService* infobar_service,
-    const string16& message,
-    const string16& ok_label,
-    const GURL& learn_more_url,
-    bool show_dont_ask_again_button)
+    PluginMetroModeInfoBarDelegate::Mode mode,
+    const string16& name)
     : ConfirmInfoBarDelegate(infobar_service),
-      message_(message),
-      ok_label_(ok_label),
-      learn_more_url_(learn_more_url),
-      show_dont_ask_again_button_(show_dont_ask_again_button) {
+      mode_(mode),
+      name_(name) {
 }
 
 PluginMetroModeInfoBarDelegate::~PluginMetroModeInfoBarDelegate() {
 }
 
 gfx::Image* PluginMetroModeInfoBarDelegate::GetIcon() const {
   return &ResourceBundle::GetSharedInstance().GetNativeImageNamed(
       IDR_INFOBAR_PLUGIN_INSTALL);
 }
 
 string16 PluginMetroModeInfoBarDelegate::GetMessageText() const {
-  return message_;
+  return l10n_util::GetStringFUTF16((mode_ == MISSING_PLUGIN) ?
+      IDS_METRO_MISSING_PLUGIN_PROMPT : IDS_METRO_NPAPI_PLUGIN_PROMPT, name_);
 }
 
 int PluginMetroModeInfoBarDelegate::GetButtons() const {
-  int buttons = BUTTON_OK;
-  if (show_dont_ask_again_button_)
-    buttons |= BUTTON_CANCEL;
-  return buttons;
+  return (mode_ == MISSING_PLUGIN) ? BUTTON_OK : (BUTTON_OK | BUTTON_CANCEL);

[Bernhard Bauer, 2012/12/22 01:55:54]

I think making these into switch statements would look clearer.

[Peter Kasting, 2012/12/26 18:40:36]

I'm not a huge fan of switches for a two-element enum (which is already just an
enum instead of a simple bool so that the states can be named more clearly).  It
expands one line of code here into seven:

  switch (mode_) {
    case MISSING_PLUGIN:
      return BUTTON_OK;

    case DESKTOP_MODE_REQUIRED:
      return BUTTON_OK | BUTTON_CANCEL;
  }

It just feels so verbose :(

[Bernhard Bauer, 2012/12/26 22:38:59]

I know what you mean, but the same argument could probably be made for having an
enum instead of a boolean flag. I guess that mismatch between having an enum
that could potentially have an arbitrary number of states, and handling one
single condition, is what feels weird to me. But if you feel strongly about it,
the current state LGTM.

 }
 
 string16 PluginMetroModeInfoBarDelegate::GetButtonLabel(
     InfoBarButton button) const {
-  if (button == BUTTON_OK)
-    return ok_label_;
-  if (button == BUTTON_CANCEL) {
-    DCHECK(show_dont_ask_again_button_);
+  if (button == BUTTON_CANCEL)
     return l10n_util::GetStringUTF16(IDS_DONT_ASK_AGAIN_INFOBAR_BUTTON_LABEL);
-  }
-  NOTREACHED();
-  return string16();
+  return l10n_util::GetStringUTF16((mode_ == MISSING_PLUGIN) ?
+      IDS_WIN8_DESKTOP_RESTART : IDS_WIN8_RESTART);
 }
 
 bool PluginMetroModeInfoBarDelegate::Accept() {
   browser::AttemptRestartWithModeSwitch();
   return true;
 }
 
 bool PluginMetroModeInfoBarDelegate::Cancel() {
-  DCHECK(show_dont_ask_again_button_);

[Bernhard Bauer, 2012/12/22 01:55:54]

Is there a reason you removed this DCHECK? I kinda like documenting assumptions
this way.

[Peter Kasting, 2012/12/26 18:40:36]

I removed this because I killed the member variable.

I could put it back as a check of the mode variable.  The only potential issue
then is that it makes the code somewhat more brittle, in that if we start
wanting to show the cancel button in both modes for some reason the check will
just get in the way.

I put the check back on the assumption you'd prefer that way.

   content::WebContents* web_contents = owner()->GetWebContents();
   Profile* profile =
       Profile::FromBrowserContext(web_contents->GetBrowserContext());
   HostContentSettingsMap* content_settings =
       profile->GetHostContentSettingsMap();
   GURL url = web_contents->GetURL();
   content_settings->SetContentSetting(
       ContentSettingsPattern::FromURL(url),
       ContentSettingsPattern::Wildcard(),
       CONTENT_SETTINGS_TYPE_METRO_SWITCH_TO_DESKTOP,
       std::string(),
       CONTENT_SETTING_BLOCK);
   return true;
 }
 
 string16 PluginMetroModeInfoBarDelegate::GetLinkText() const {
   return l10n_util::GetStringUTF16(IDS_LEARN_MORE);
 }
 
 bool PluginMetroModeInfoBarDelegate::LinkClicked(
     WindowOpenDisposition disposition) {
   OpenURLParams params(
-      learn_more_url_, Referrer(),
+      GURL((mode_ == MISSING_PLUGIN) ?
+          "https://support.google.com/chrome/?ib_display_in_desktop" :
+          "https://support.google.com/chrome/?ib_redirect_to_desktop"),
+      Referrer(),
       (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition,
       content::PAGE_TRANSITION_LINK, false);
   owner()->GetWebContents()->OpenURL(params);
   return false;
 }
 #endif  // defined(OS_WIN)
 #endif  // defined(ENABLE_PLUGIN_INSTALLATION)