Relaxes constraint that typing in a url in the omnibox of a pinned tab

opens in foreground to allow changes to the path of the url to open in
current tab.

BUG=26490
TEST=none

Review URL: http://codereview.chromium.org/372001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31250 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 10 insertions, 4 deletions

diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
index 96c44af..3bdbb97 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -777,13 +777,19 @@ void Browser::OpenCurrentURL() {
   LocationBar* location_bar = window_->GetLocationBar();
   WindowOpenDisposition open_disposition =
       location_bar->GetWindowOpenDisposition();
+  GURL url(WideToUTF8(location_bar->GetInputString()));
   if (open_disposition == CURRENT_TAB &&
       tabstrip_model()->IsTabPinned(selected_index())) {
     // To make pinned tabs feel more permanent any requests from the omnibox
-    // to open a url in the current tab result in creating a new tab.
-    open_disposition = NEW_FOREGROUND_TAB;
-  }
-  OpenURLAtIndex(NULL, GURL(WideToUTF8(location_bar->GetInputString())), GURL(),
+    // to open a url in the current tab with a host different from the current
+    // host of the pinned tab result in creating a new tab. We allow changes to
+    // the path so that the user can trigger reloads or fix up parts of the url
+    // without spawning a new tab.
+    TabContents* selected_contents = GetSelectedTabContents();
+    if (!selected_contents || url.host() != selected_contents->GetURL().host())
+      open_disposition = NEW_FOREGROUND_TAB;
+  }
+  OpenURLAtIndex(NULL, url, GURL(),
                  open_disposition,
                  location_bar->GetPageTransition(), -1, true);
 }