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

chrome/browser/custom_handlers/register_protocol_handler_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/custom_handlers/register_protocol_handler_infobar_delegate.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
+#include "chrome/browser/google/google_util.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 RegisterProtocolHandlerInfoBarDelegate::RegisterProtocolHandlerInfoBarDelegate(
     TabContents* tab_contents,
     ProtocolHandlerRegistry* registry,
     const ProtocolHandler& handler)
     : ConfirmInfoBarDelegate(tab_contents),
@@ skipping 57 matching lines @@
   registry_->OnIgnoreRegisterProtocolHandler(handler_);
   return true;
 }
 
 string16 RegisterProtocolHandlerInfoBarDelegate::GetLinkText() const {
   return l10n_util::GetStringUTF16(IDS_LEARN_MORE);
 }
 
 bool RegisterProtocolHandlerInfoBarDelegate::LinkClicked(
     WindowOpenDisposition disposition) {
-  // Ignore the click dispostion and always open in a new top level tab.
-  tab_contents_->OpenURL(GURL(chrome::kLearnMoreRegisterProtocolHandlerURL),
-                         GURL(), NEW_FOREGROUND_TAB, PageTransition::LINK);
+  tab_contents_->OpenURL(google_util::AppendGoogleLocaleParam(GURL(
+      chrome::kLearnMoreRegisterProtocolHandlerURL)), GURL(),
+      (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition,
+      PageTransition::LINK);
   return false;
 }