Unify infobars' link-opening behavior to respect user-requested dispositions and append the Googl...

chrome/browser/plugin_installer_infobar_delegate.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/plugin_installer_infobar_delegate.h"
 
+#include "chrome/browser/google/google_util.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/view_messages.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources_standard.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 PluginInstallerInfoBarDelegate::PluginInstallerInfoBarDelegate(
@@ skipping 34 matching lines @@
   host->Send(new ViewMsg_InstallMissingPlugin(host->routing_id()));
   return true;
 }
 
 string16 PluginInstallerInfoBarDelegate::GetLinkText() const {
   return l10n_util::GetStringUTF16(IDS_PLUGININSTALLER_PROBLEMSINSTALLING);
 }
 
 bool PluginInstallerInfoBarDelegate::LinkClicked(
     WindowOpenDisposition disposition) {
-  // Ignore the click dispostion and always open in a new top level tab.
-  static const char kLearnMorePluginInstallerUrl[] = "http://www.google.com/"
-      "support/chrome/bin/answer.py?answer=95697&topic=14687";
-  tab_contents_->OpenURL(GURL(kLearnMorePluginInstallerUrl), GURL(),
-                         NEW_FOREGROUND_TAB, PageTransition::LINK);
+  tab_contents_->OpenURL(google_util::AppendGoogleLocaleParam(GURL(
+      "http://www.google.com/support/chrome/bin/answer.py?answer=95697&topic="
+      "14687")), GURL(),
+      (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition,
+      PageTransition::LINK);
   return false;
 }