commit 190095d42ef36347df265f40df190ec8be190d9e
author Leon Scroggins <scroggo@google.com> Mon Aug 17 17:01:38 2009 -0400
committer Leon Scroggins <scroggo@google.com> Mon Aug 17 17:01:38 2009 -0400
tree 80a3a03169d0906d5c12c8ec3b40291fb90fc86f
parent 160a7e7d27755b7a3715ad87735b8070ab64d58a

Disable "open in new window" if Go came up from a new tab.

src/com/android/browser/BrowserActivity.java

diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java
index 8adba4b..dda1795 100644
--- a/src/com/android/browser/BrowserActivity.java
+++ b/src/com/android/browser/BrowserActivity.java
@@ -3901,8 +3901,11 @@
         }
         intent.putExtra("title", title);
         intent.putExtra("url", url);
-        intent.putExtra("maxTabsOpen",
-                mTabControl.getTabCount() >= TabControl.MAX_TABS);
+        // If this is opening in a new window, then disable opening in a
+        // (different) new window.  Also disable it if we have maxed out the
+        // windows.
+        intent.putExtra("disable_new_window", cancelGoPageMeansClose
+                || mTabControl.getTabCount() >= TabControl.MAX_TABS);
         intent.putExtra("touch_icon_url", current.getTouchIconUrl());
         if (startWithHistory) {
             intent.putExtra(CombinedBookmarkHistoryActivity.STARTING_TAB,