Add a help center link to NaCl infobar

Add a help center link to NaCl infobar

This CL adds a help center link to the infobar which is displayed when
a NaCl app doesn't support the user's architecture.

R=jvoung@chromium.org,sehr@chromium.org (code), cstefansen (URL)
BUG= http://code.google.com/p/chromium/issues/detail?id=168607


Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=175889

[jvoung (off chromium), 2013-01-07 22:13:39]

https://codereview.chromium.org/11593020/diff/2001/chrome/browser/nacl_host/n...
File chrome/browser/nacl_host/nacl_infobar.cc (right):

https://codereview.chromium.org/11593020/diff/2001/chrome/browser/nacl_host/n...
chrome/browser/nacl_host/nacl_infobar.cc:30: class NaClInfobarDelegate : public
ConfirmInfoBarDelegate {
Could you make the definitions out of line instead of inline?  Most of the other
ConfirmInfoBarDelegates users seem to do that and they also put "OVERRIDE" in
each of the virtual method declarations.

[Derek Schuff, 2013-01-08 16:53:27]

also fixed include order and change capitalization to match the base class.

https://codereview.chromium.org/11593020/diff/2001/chrome/browser/nacl_host/n...
File chrome/browser/nacl_host/nacl_infobar.cc (right):

https://codereview.chromium.org/11593020/diff/2001/chrome/browser/nacl_host/n...
chrome/browser/nacl_host/nacl_infobar.cc:30: class NaClInfobarDelegate : public
ConfirmInfoBarDelegate {
On 2013/01/07 22:13:39, jvoung (cr) wrote:
> Could you make the definitions out of line instead of inline?  Most of the
other
> ConfirmInfoBarDelegates users seem to do that and they also put "OVERRIDE" in
> each of the virtual method declarations.

Done.

[jvoung (off chromium), 2013-01-08 17:26:08]

lgtm

[commit-bot: I haz the power, 2013-01-09 17:05:03]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/dschuff@chromium.org/11593020/7001

[commit-bot: I haz the power, 2013-01-09 17:05:05]

Failed to apply patch for chrome/browser/nacl_host/nacl_infobar.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file chrome/browser/nacl_host/nacl_infobar.cc
  Hunk #2 FAILED at 68.
  1 out of 2 hunks FAILED -- saving rejects to file
chrome/browser/nacl_host/nacl_infobar.cc.rej

Patch:       chrome/browser/nacl_host/nacl_infobar.cc
Index: chrome/browser/nacl_host/nacl_infobar.cc
diff --git a/chrome/browser/nacl_host/nacl_infobar.cc
b/chrome/browser/nacl_host/nacl_infobar.cc
index
764ded005b96a1f4ca3caf910f23a6c36b90b69a..6dcf32d90a24732f3bb054f0f58956a109452698
100644
--- a/chrome/browser/nacl_host/nacl_infobar.cc
+++ b/chrome/browser/nacl_host/nacl_infobar.cc
@@ -5,21 +5,59 @@
 #include "chrome/browser/nacl_host/nacl_infobar.h"
 
 #include "base/bind.h"
+#include "base/string16.h"
+#include "chrome/browser/api/infobars/confirm_infobar_delegate.h"
 #include "chrome/browser/api/infobars/infobar_service.h"
-#include "chrome/browser/api/infobars/simple_alert_infobar_delegate.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
+#include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 #include "ppapi/c/private/ppb_nacl_private.h"
 #include "ui/base/l10n/l10n_util.h"
 
-
 using content::BrowserThread;
 using content::RenderViewHost;
 using content::WebContents;
 
 namespace {
+// The URL for the "learn more" article.
+const char kNaClLearnMoreUrl[] =
+    "https://support.google.com/chrome/?p=ib_nacl";
+
+// A simple LinkInfoBarDelegate doesn't support making the link right-aligned
+// so use a ConfirmInfoBarDelegate without any buttons instead.
+class NaClInfoBarDelegate : public ConfirmInfoBarDelegate {
+ public:
+  NaClInfoBarDelegate(WebContents* wc, InfoBarService* ibs) :
+      ConfirmInfoBarDelegate(ibs), wc_(wc) {}
+  virtual string16 GetMessageText() const OVERRIDE;
+  virtual string16 GetLinkText() const OVERRIDE;
+  virtual bool LinkClicked(WindowOpenDisposition disposition) OVERRIDE;
+  virtual int GetButtons() const OVERRIDE;
+ private:
+  WebContents* wc_;
+};
+
+string16 NaClInfoBarDelegate::GetMessageText() const {
+  return l10n_util::GetStringUTF16(IDS_NACL_APP_MISSING_ARCH_MESSAGE);
+}
+
+string16 NaClInfoBarDelegate::GetLinkText() const {
+  return l10n_util::GetStringUTF16(IDS_LEARN_MORE);
+}
+
+bool NaClInfoBarDelegate::LinkClicked(WindowOpenDisposition disposition) {
+  content::OpenURLParams params(
+      GURL(kNaClLearnMoreUrl), content::Referrer(),
+      (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition,
+      content::PAGE_TRANSITION_LINK,
+      false);
+  wc_->OpenURL(params);
+  return false;
+}
+
+int NaClInfoBarDelegate::GetButtons() const { return BUTTON_NONE; }
 
 void ShowInfobar(int render_process_id, int render_view_id,
                  int error_id) {
@@ -30,8 +68,7 @@ void ShowInfobar(int render_process_id, int render_view_id,
                                                render_view_id);
   WebContents* wc = WebContents::FromRenderViewHost(rvh);
   InfoBarService* ibs = InfoBarService::FromWebContents(wc);
-  ibs->AddInfoBar(new SimpleAlertInfoBarDelegate(ibs, NULL,
-        l10n_util::GetStringUTF16(IDS_NACL_APP_MISSING_ARCH_MESSAGE), true));
+  ibs->AddInfoBar(new NaClInfoBarDelegate(wc, ibs));
 }
 
 }  // namespace

[commit-bot: I haz the power, 2013-01-09 19:05:56]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/dschuff@chromium.org/11593020/11001

[commit-bot: I haz the power, 2013-01-09 21:41:18]

Change committed as 175889