Reverse the Yes and No buttons for the PDF infobars.

chrome/browser/pdf_unsupported_feature.cc

 // 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/pdf_unsupported_feature.h"
 
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "base/version.h"
 #include "chrome/browser/metrics/user_metrics.h"
@@ skipping 16 matching lines @@
 using webkit::npapi::PluginGroup;
 using webkit::npapi::PluginList;
 using webkit::npapi::WebPluginInfo;
 
 // Only launch Adobe Reader X or later.
 static const uint16 kMinReaderVersionToUse = 10;
 
 namespace {
 
 // The info bar delegate used to ask the user if they want to use Adobe Reader
-// by default.
+// by default.  We want the infobar to have [No][Yes], so we swap the text on
+// the buttons, and the meaning of the delegate callbacks.
 class PDFEnableAdobeReaderConfirmInfoBarDelegate
     : public ConfirmInfoBarDelegate {
  public:
   PDFEnableAdobeReaderConfirmInfoBarDelegate(
       TabContents* tab_contents)
       : ConfirmInfoBarDelegate(tab_contents) {
     UserMetrics::RecordAction(
         UserMetricsAction("PDF_EnableReaderInfoBarShown"));
   }
 
   // ConfirmInfoBarDelegate
   virtual void InfoBarClosed() {
     delete this;
   }
 
   virtual void InfoBarDismissed() {
-    Cancel();
+    OnNo();
   }
 
   virtual Type GetInfoBarType() const {
     return PAGE_ACTION_TYPE;
   }
 
   virtual bool Accept() {
-    UserMetrics::RecordAction(
-        UserMetricsAction("PDF_EnableReaderInfoBarOK"));
-    webkit::npapi::PluginList::Singleton()->EnableGroup(
-        false, ASCIIToUTF16(PepperPluginRegistry::kPDFPluginName));
-    webkit::npapi::PluginList::Singleton()->EnableGroup(
-        true, ASCIIToUTF16(webkit::npapi::PluginGroup::kAdobeReaderGroupName));
-    return true;
+    return OnNo();
   }
 
   virtual bool Cancel() {
-    UserMetrics::RecordAction(
-        UserMetricsAction("PDF_EnableReaderInfoBarCancel"));
-    return true;
+    return OnYes();
   }
 
   virtual int GetButtons() const {
     return BUTTON_OK | BUTTON_CANCEL;
   }
 
   virtual string16 GetButtonLabel(InfoBarButton button) const {
     switch (button) {
       case BUTTON_OK:
         return l10n_util::GetStringUTF16(
-            IDS_CONFIRM_MESSAGEBOX_YES_BUTTON_LABEL);
+            IDS_CONFIRM_MESSAGEBOX_NO_BUTTON_LABEL);
       case BUTTON_CANCEL:
         return l10n_util::GetStringUTF16(
-            IDS_CONFIRM_MESSAGEBOX_NO_BUTTON_LABEL);
+            IDS_CONFIRM_MESSAGEBOX_YES_BUTTON_LABEL);
       default:
         // All buttons are labeled above.
         NOTREACHED() << "Bad button id " << button;
         return string16();
     }
   }
 
   virtual string16 GetMessageText() const {
     return l10n_util::GetStringUTF16(
         IDS_PDF_INFOBAR_QUESTION_ALWAYS_USE_READER);
   }
 
  private:
+  bool OnYes() {
+    UserMetrics::RecordAction(
+        UserMetricsAction("PDF_EnableReaderInfoBarOK"));
+    webkit::npapi::PluginList::Singleton()->EnableGroup(
+        false, ASCIIToUTF16(PepperPluginRegistry::kPDFPluginName));
+    webkit::npapi::PluginList::Singleton()->EnableGroup(
+        true, ASCIIToUTF16(webkit::npapi::PluginGroup::kAdobeReaderGroupName));
+    return true;
+  }
+
+  bool OnNo() {
+    UserMetrics::RecordAction(
+        UserMetricsAction("PDF_EnableReaderInfoBarCancel"));
+    return true;
+  }
+
   DISALLOW_IMPLICIT_CONSTRUCTORS(PDFEnableAdobeReaderConfirmInfoBarDelegate);
 };
 
 // Launch the url to get the latest Adbobe Reader installer.
 void OpenReaderUpdateURL(TabContents* tab) {
   tab->OpenURL(GURL(PluginGroup::kAdobeReaderUpdateURL), GURL(), CURRENT_TAB,
                PageTransition::LINK);
 }
 
 // Opens the PDF using Adobe Reader.
@@ skipping 87 matching lines @@
     Proceed();
   }
 
  private:
   WebPluginInfo reader_webplugininfo_;
 
   DISALLOW_COPY_AND_ASSIGN(PDFUnsupportedFeatureInterstitial);
 };
 
 // The info bar delegate used to inform the user that we don't support a feature
-// in the PDF.
+// in the PDF.  See the comment about how we swap buttons for
+// PDFEnableAdobeReaderConfirmInfoBarDelegate.
 class PDFUnsupportedFeatureConfirmInfoBarDelegate
     : public ConfirmInfoBarDelegate {
  public:
   PDFUnsupportedFeatureConfirmInfoBarDelegate(
       TabContents* tab_contents,
       PluginGroup* reader_group)  // NULL if Adobe Reader isn't installed.
       : ConfirmInfoBarDelegate(tab_contents),
         tab_contents_(tab_contents),
         reader_installed_(!!reader_group),
         reader_vulnerable_(false) {
@@ skipping 17 matching lines @@
           UserMetricsAction("PDF_InstallReaderInfoBarShown"));
     }
   }
 
   // ConfirmInfoBarDelegate
   virtual void InfoBarClosed() {
     delete this;
   }
 
   virtual void InfoBarDismissed() {
-    Cancel();
+    OnNo();
   }
 
   virtual Type GetInfoBarType() const {
     return PAGE_ACTION_TYPE;
   }
 
   virtual bool Accept() {
-    if (!reader_installed_) {
+    return OnNo();
+  }
+
+  virtual bool Cancel() {
+    return OnYes();
+  }
+
+  virtual int GetButtons() const {
+    return BUTTON_OK | BUTTON_CANCEL;
+  }
+
+  virtual string16 GetButtonLabel(InfoBarButton button) const {
+    switch (button) {
+      case BUTTON_OK:
+        return l10n_util::GetStringUTF16(
+            IDS_CONFIRM_MESSAGEBOX_NO_BUTTON_LABEL);
+      case BUTTON_CANCEL:
+        return l10n_util::GetStringUTF16(
+            IDS_CONFIRM_MESSAGEBOX_YES_BUTTON_LABEL);
+      default:
+        // All buttons are labeled above.
+        NOTREACHED() << "Bad button id " << button;
+        return string16();
+    }
+  }
+
+  virtual string16 GetMessageText() const {
+    return l10n_util::GetStringUTF16(reader_installed_ ?
+        IDS_PDF_INFOBAR_QUESTION_READER_INSTALLED :
+        IDS_PDF_INFOBAR_QUESTION_READER_NOT_INSTALLED);
+  }
+
+ private:
+  bool OnYes() {
+   if (!reader_installed_) {
       UserMetrics::RecordAction(
           UserMetricsAction("PDF_InstallReaderInfoBarOK"));
       OpenReaderUpdateURL(tab_contents_);
       return true;
     }
 
     UserMetrics::RecordAction(
         UserMetricsAction("PDF_UseReaderInfoBarOK"));
 
     if (reader_vulnerable_) {
       PDFUnsupportedFeatureInterstitial* interstitial = new
           PDFUnsupportedFeatureInterstitial(
               tab_contents_, reader_webplugininfo_);
       interstitial->Show();
       return true;
     }
 
     OpenUsingReader(tab_contents_, reader_webplugininfo_, this);
     return false;
   }
 
-  virtual bool Cancel() {
+  bool OnNo() {
     if (reader_installed_) {
       UserMetrics::RecordAction(
           UserMetricsAction("PDF_UseReaderInfoBarCancel"));
     } else {
       UserMetrics::RecordAction(
           UserMetricsAction("PDF_InstallReaderInfoBarCancel"));
     }
     return true;
   }
 
-  virtual int GetButtons() const {
-    return BUTTON_OK | BUTTON_CANCEL;
-  }
-
-  virtual string16 GetButtonLabel(InfoBarButton button) const {
-    switch (button) {
-      case BUTTON_OK:
-        return l10n_util::GetStringUTF16(
-            IDS_CONFIRM_MESSAGEBOX_YES_BUTTON_LABEL);
-      case BUTTON_CANCEL:
-        return l10n_util::GetStringUTF16(
-            IDS_CONFIRM_MESSAGEBOX_NO_BUTTON_LABEL);
-      default:
-        // All buttons are labeled above.
-        NOTREACHED() << "Bad button id " << button;
-        return string16();
-    }
-  }
-
-  virtual string16 GetMessageText() const {
-    return l10n_util::GetStringUTF16(reader_installed_ ?
-        IDS_PDF_INFOBAR_QUESTION_READER_INSTALLED :
-        IDS_PDF_INFOBAR_QUESTION_READER_NOT_INSTALLED);
-  }
-
- private:
   TabContents* tab_contents_;
   bool reader_installed_;
   bool reader_vulnerable_;
   WebPluginInfo reader_webplugininfo_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(PDFUnsupportedFeatureConfirmInfoBarDelegate);
 };
 
 }  // namespace
 
@@ skipping 16 matching lines @@
   for (size_t i = 0; i < plugin_groups.size(); ++i) {
     if (plugin_groups[i].GetGroupName() == reader_group_name) {
       reader_group = &plugin_groups[i];
       break;
     }
   }
 
   tab->AddInfoBar(new PDFUnsupportedFeatureConfirmInfoBarDelegate(
       tab, reader_group));
 }