Fix a case where non-tabbed browser windows could open tabs. Also includes UI...

chrome/browser/browser.cc

 // Copyright (c) 2006-2008 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"
 
 #include "base/command_line.h"
 #include "base/idle_timer.h"
 #include "base/logging.h"
 #include "base/string_util.h"
@@ skipping 455 matching lines @@
 
   CloseAllTabs();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // Browser, Tab adding/showing functions:
 
 TabContents* Browser::AddTabWithURL(
     const GURL& url, const GURL& referrer, PageTransition::Type transition,
     bool foreground, SiteInstance* instance) {
-  if ((type_ & TYPE_APP) != 0 && tabstrip_model_.count() == 1) {
-    NOTREACHED() << "Cannot add a tab in a mono tab application.";
-    return NULL;
+  TabContents* contents = NULL;
+  if (type_ == TYPE_NORMAL) {
+    GURL url_to_load = url;
+    if (url_to_load.is_empty())
+      url_to_load = GetHomePage();
+    contents = CreateTabContentsForURL(url_to_load, referrer, profile_,
+                                       transition, false, instance);
+    tabstrip_model_.AddTabContents(contents, -1, transition, foreground);
+    // By default, content believes it is not hidden.  When adding contents
+    // in the background, tell it that it's hidden.
+    if (!foreground)
+      contents->WasHidden();
+  } else {
+    // We're in an app window or a popup window. Find an existing browser to
+    // open this URL in, creating one if none exists.
+    Browser* b = GetOrCreateTabbedBrowser();
+    contents = b->AddTabWithURL(url, referrer, transition, foreground,
+                                instance);
+    b->window()->Show();
   }
-
-  GURL url_to_load = url;
-  if (url_to_load.is_empty())
-    url_to_load = GetHomePage();
-  TabContents* contents =
-      CreateTabContentsForURL(url_to_load, referrer, profile_, transition,
-                              false, instance);
-  tabstrip_model_.AddTabContents(contents, -1, transition, foreground);
-  // By default, content believes it is not hidden.  When adding contents
-  // in the background, tell it that it's hidden.
-  if (!foreground)
-    contents->WasHidden();
   return contents;
 }
 
 TabContents* Browser::AddTabWithNavigationController(
     NavigationController* ctrl, PageTransition::Type type) {
   TabContents* tc = ctrl->active_contents();
   tabstrip_model_.AddTabContents(tc, -1, type, true);
   return tc;
 }
 
@@ skipping 2007 matching lines @@
 
   // We need to register the window position pref.
   std::wstring window_pref(prefs::kBrowserWindowPlacement);
   window_pref.append(L"_");
   window_pref.append(app_name);
   PrefService* prefs = g_browser_process->local_state();
   DCHECK(prefs);
 
   prefs->RegisterDictionaryPref(window_pref.c_str());
 }