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

chrome/browser/plugin_observer.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_observer.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/plugin_installer_infobar_delegate.h"
@@ skipping 53 matching lines @@
 PluginInfoBarDelegate::~PluginInfoBarDelegate() {
 }
 
 bool PluginInfoBarDelegate::Cancel() {
   tab_contents_->render_view_host()->Send(new ViewMsg_LoadBlockedPlugins(
       tab_contents_->render_view_host()->routing_id()));
   return true;
 }
 
 bool PluginInfoBarDelegate::LinkClicked(WindowOpenDisposition disposition) {
-  if (disposition == CURRENT_TAB)
-    disposition = NEW_FOREGROUND_TAB;
-  GURL url = google_util::AppendGoogleLocaleParam(GURL(GetLearnMoreURL()));
-  tab_contents_->OpenURL(url, GURL(), disposition, PageTransition::LINK);
+  tab_contents_->OpenURL(
+      google_util::AppendGoogleLocaleParam(GURL(GetLearnMoreURL())), GURL(),
+      (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition,
+      PageTransition::LINK);
   return false;
 }
 
 gfx::Image* PluginInfoBarDelegate::GetIcon() const {
   return &ResourceBundle::GetSharedInstance().GetNativeImageNamed(
       IDR_INFOBAR_PLUGIN_INSTALL);
 }
 
 string16 PluginInfoBarDelegate::GetLinkText() const {
   return l10n_util::GetStringUTF16(IDS_LEARN_MORE);
@@ skipping 268 matching lines @@
       true));
 }
 
 void PluginObserver::OnBlockedOutdatedPlugin(const string16& name,
                                              const GURL& update_url) {
   tab_contents_->AddInfoBar(update_url.is_empty() ?
       static_cast<InfoBarDelegate*>(new BlockedPluginInfoBarDelegate(
           tab_contents(), name)) :
       new OutdatedPluginInfoBarDelegate(tab_contents(), name, update_url));
 }