Remove attempt to be smart about where to open navigations

chrome/browser/browser.cc

 // Copyright (c) 2010 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/browser.h"
 
 #if defined(OS_WIN)
 #include <shellapi.h>
 #include <windows.h>
 #endif  // OS_WIN
@@ skipping 1262 matching lines @@
         selected_contents->GetURL().GetOrigin() ==
             GURL(chrome::kChromeUINewTabURL).GetOrigin()) {
       // If the |url| is within an app's web extent and it was typed into the
       // omnibox of an NTP page, interpret as an app launch and close the NTP
       // tab.
       Browser::OpenApplication(profile(), extension,
           extension->launch_container());
       CloseTabContents(selected_contents);
       return;
     }
-
-    if (selected_contents) {
-      // For the purposes of changing the window open disposition, the referrer
-      // is the current tab's URL.
-      open_disposition = AdjustWindowOpenDispositionForTab(
-          IsPinned(selected_contents),
-          url,
-          selected_contents->GetURL(),
-          location_bar->GetPageTransition(),
-          open_disposition);
-    }
   }
 
   // Use ADD_INHERIT_OPENER so that all pages opened by the omnibox at least
   // inherit the opener. In some cases the tabstrip will determine the group
   // should be inherited, in which case the group is inherited instead of the
   // opener.
   OpenURLAtIndex(NULL, url, GURL(), open_disposition,
                  location_bar->GetPageTransition(), -1,
                  TabStripModel::ADD_FORCE_INDEX |
                      TabStripModel::ADD_INHERIT_OPENER);
@@ skipping 2468 matching lines @@
 
 // static
 Browser* Browser::GetOrCreateTabbedBrowser(Profile* profile) {
   Browser* browser = BrowserList::FindBrowserWithType(profile, TYPE_NORMAL,
                                                       false);
   if (!browser)
     browser = Browser::Create(profile);
   return browser;
 }
 
-// static
-WindowOpenDisposition Browser::AdjustWindowOpenDispositionForTab(
-    bool is_pinned,
-    const GURL& url,
-    const GURL& referrer,
-    PageTransition::Type transition,
-    WindowOpenDisposition original_disposition) {
-  if (!is_pinned ||
-      original_disposition != CURRENT_TAB ||
-      (transition != PageTransition::AUTO_BOOKMARK &&
-       transition != PageTransition::LINK &&
-       transition != PageTransition::TYPED)) {
-    return original_disposition;
-  }
-
-  bool url_is_http_or_https =
-       url.SchemeIs(chrome::kHttpScheme) ||
-       url.SchemeIs(chrome::kHttpsScheme);
-  bool referrer_is_http_or_https =
-       referrer.SchemeIs(chrome::kHttpScheme) ||
-       referrer.SchemeIs(chrome::kHttpsScheme);
-  bool scheme_matches =
-      (url.scheme() == referrer.scheme()) ||
-      (url_is_http_or_https && referrer_is_http_or_https);
-
-  // If the host and scheme are the same, then we allow the link to open in
-  // the current tab, to make the page feel more web-appy.
-  if (url.host() == referrer.host() && scheme_matches)
-    return original_disposition;
-
-  return NEW_FOREGROUND_TAB;
-}
-
 void Browser::OpenURLAtIndex(TabContents* source,
                              const GURL& url,
                              const GURL& referrer,
                              WindowOpenDisposition disposition,
                              PageTransition::Type transition,
                              int index,
                              int add_types) {
   // TODO(beng): Move all this code into a separate helper that has unit tests.
 
   // No code for these yet
   DCHECK((disposition != NEW_POPUP) && (disposition != SAVE_TO_DISK));
 
   TabContents* current_tab = source ? source : GetSelectedTabContents();
   bool source_tab_was_frontmost = (current_tab == GetSelectedTabContents());
   TabContents* new_contents = NULL;
 
   // Opening a bookmark counts as a user gesture, so we don't need to avoid
   // carpet-bombing here.
   PageTransition::Type baseTransitionType =
     PageTransition::StripQualifier(transition);
   if ((baseTransitionType == PageTransition::TYPED ||
       baseTransitionType == PageTransition::AUTO_BOOKMARK) &&
       current_tab != NULL) {
     RenderViewHostDelegate::BrowserIntegration* delegate = current_tab;
     delegate->OnUserGesture();
   }
 
-  disposition = AdjustWindowOpenDispositionForTab(
-      current_tab && IsPinned(current_tab),
-      url,
-      referrer,
-      transition,
-      disposition);
-
   // If the URL is part of the same web site, then load it in the same
   // SiteInstance (and thus the same process).  This is an optimization to
   // reduce process overhead; it is not necessary for compatibility.  (That is,
   // the new tab will not have script connections to the previous tab, so it
   // does not need to be part of the same SiteInstance or BrowsingInstance.)
   // Default to loading in a new SiteInstance and BrowsingInstance.
   // TODO(creis): should this apply to applications?
   SiteInstance* instance = NULL;
   // Don't use this logic when "--process-per-tab" is specified.
   if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kProcessPerTab)) {
@@ skipping 223 matching lines @@
 }
 
 void Browser::TabRestoreServiceDestroyed(TabRestoreService* service) {
   if (!tab_restore_service_)
     return;
 
   DCHECK_EQ(tab_restore_service_, service);
   tab_restore_service_->RemoveObserver(this);
   tab_restore_service_ = NULL;
 }
-
-bool Browser::IsPinned(TabContents* source) {
-  int index = tabstrip_model_.GetIndexOfTabContents(source);
-  if (index == TabStripModel::kNoTab) {
-    NOTREACHED() << "IsPinned called for tab not in our strip";
-    return false;
-  }
-  return tabstrip_model_.IsTabPinned(index);
-}