Merge 80510 - Link to a different place for the "blocked" plug-in infobar vs. the out-of-dateplug-in infobar. We'll get the new help text up imminently.BUG=76737Review URL: http://codereview.chromium.org/6693087

TBR=cevans@chromium.org
Review URL: http://codereview.chromium.org/6691075

git-svn-id: svn://svn.chromium.org/chrome/branches/696/src@80543 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 21 insertions, 4 deletions

diff --git a/chrome/browser/plugin_observer.cc b/chrome/browser/plugin_observer.cc
index 5a4b3f1..a8b03e0 100644
--- a/chrome/browser/plugin_observer.cc
+++ b/chrome/browser/plugin_observer.cc
@@ -41,6 +41,8 @@ class PluginInfoBarDelegate : public ConfirmInfoBarDelegate {
   virtual bool Cancel();
   virtual bool LinkClicked(WindowOpenDisposition disposition);
 
+  virtual std::string GetLearnMoreURL() const = 0;
+
   string16 name_;
   TabContents* tab_contents_;
 
@@ -72,8 +74,7 @@ bool PluginInfoBarDelegate::Cancel() {
 }
 
 bool PluginInfoBarDelegate::LinkClicked(WindowOpenDisposition disposition) {
-  GURL url = google_util::AppendGoogleLocaleParam(
-      GURL(chrome::kOutdatedPluginLearnMoreURL));
+  GURL url = google_util::AppendGoogleLocaleParam(GURL(GetLearnMoreURL()));
   tab_contents_->OpenURL(url, GURL(), NEW_FOREGROUND_TAB, PageTransition::LINK);
   return false;
 }
@@ -106,6 +107,7 @@ class BlockedPluginInfoBarDelegate : public PluginInfoBarDelegate {
   virtual void InfoBarClosed();
   virtual void InfoBarDismissed();
   virtual bool LinkClicked(WindowOpenDisposition disposition);
+  virtual std::string GetLearnMoreURL() const;
 
   DISALLOW_COPY_AND_ASSIGN(BlockedPluginInfoBarDelegate);
 };
@@ -133,6 +135,10 @@ BlockedPluginInfoBarDelegate::BlockedPluginInfoBarDelegate(
 BlockedPluginInfoBarDelegate::~BlockedPluginInfoBarDelegate() {
 }
 
+std::string BlockedPluginInfoBarDelegate::GetLearnMoreURL() const {
+  return chrome::kBlockedPluginLearnMoreURL;
+}
+
 string16 BlockedPluginInfoBarDelegate::GetMessageText() const {
   return l10n_util::GetStringFUTF16(IDS_PLUGIN_NOT_AUTHORIZED, name_);
 }
@@ -194,6 +200,7 @@ class OutdatedPluginInfoBarDelegate : public PluginInfoBarDelegate {
   virtual void InfoBarClosed();
   virtual void InfoBarDismissed();
   virtual bool LinkClicked(WindowOpenDisposition disposition);
+  virtual std::string GetLearnMoreURL() const;
 
   GURL update_url_;
 
@@ -231,6 +238,10 @@ OutdatedPluginInfoBarDelegate::OutdatedPluginInfoBarDelegate(
 OutdatedPluginInfoBarDelegate::~OutdatedPluginInfoBarDelegate() {
 }
 
+std::string OutdatedPluginInfoBarDelegate::GetLearnMoreURL() const {
+  return chrome::kOutdatedPluginLearnMoreURL;
+}
+
 string16 OutdatedPluginInfoBarDelegate::GetMessageText() const {
   return l10n_util::GetStringFUTF16(IDS_PLUGIN_OUTDATED_PROMPT, name_);
 }
diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc
index 4609ef7..158c7d6 100644
--- a/chrome/common/url_constants.cc
+++ b/chrome/common/url_constants.cc
@@ -243,7 +243,10 @@ const char kLearnMoreReportingURL[] =
     "http://www.google.com/support/chrome/bin/answer.py?answer=96817";
 
 const char kOutdatedPluginLearnMoreURL[] =
-    "http://www.google.com/support/chrome/bin/answer.py?answer=1181003";
+    "https://www.google.com/support/chrome/bin/answer.py?answer=1181003";
+
+const char kBlockedPluginLearnMoreURL[] =
+    "https://www.google.com/support/chrome/bin/answer.py?answer=1247383";
 
 void RegisterChromeSchemes() {
   // Don't need "chrome-internal" which was used in old versions of Chrome for
diff --git a/chrome/common/url_constants.h b/chrome/common/url_constants.h
index 563be8a..96bce68 100644
--- a/chrome/common/url_constants.h
+++ b/chrome/common/url_constants.h
@@ -219,9 +219,12 @@ extern const char kChromiumProjectURL[];
 // first run dialog.
 extern const char kLearnMoreReportingURL[];
 
-// The URL for the "Learn more" page for the blocked/outdated plugin infobar.
+// The URL for the "Learn more" page for the outdated plugin infobar.
 extern const char kOutdatedPluginLearnMoreURL[];
 
+// The URL for the "Learn more" page for the blocked plugin infobar.
+extern const char kBlockedPluginLearnMoreURL[];
+
 // Call near the beginning of startup to register Chrome's internal URLs that
 // should be parsed as "standard" with the googleurl library.
 void RegisterChromeSchemes();