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

chrome/browser/geolocation/chrome_geolocation_permission_context.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/geolocation/chrome_geolocation_permission_context.h"
 
 #include <functional>
 #include <string>
 #include <vector>
 
@@ skipping 196 matching lines @@
 
 bool GeolocationConfirmInfoBarDelegate::LinkClicked(
     WindowOpenDisposition disposition) {
   const char kGeolocationLearnMoreUrl[] =
 #if defined(OS_CHROMEOS)
       "https://www.google.com/support/chromeos/bin/answer.py?answer=142065";
 #else
       "https://www.google.com/support/chrome/bin/answer.py?answer=142065";
 #endif
 
-  // Ignore the click disposition and always open in a new top level tab.
   tab_contents_->OpenURL(
       google_util::AppendGoogleLocaleParam(GURL(kGeolocationLearnMoreUrl)),
-      GURL(), NEW_FOREGROUND_TAB, PageTransition::LINK);
+      GURL(), (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition,
+      PageTransition::LINK);
   return false;  // Do not dismiss the info bar.
 }
 
 }  // namespace
 
 
 // GeolocationInfoBarQueueController::PendingInfoBarRequest -------------------
 
 struct GeolocationInfoBarQueueController::PendingInfoBarRequest {
  public:
@@ skipping 390 matching lines @@
   if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
     BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, NewRunnableMethod(
         this, &ChromeGeolocationPermissionContext::CancelPendingInfoBarRequest,
         render_process_id, render_view_id, bridge_id));
      return;
   }
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   geolocation_infobar_queue_controller_->CancelInfoBarRequest(render_process_id,
       render_view_id, bridge_id);
 }