| Index: chrome/browser/browser.cc
|
| ===================================================================
|
| --- chrome/browser/browser.cc (revision 13823)
|
| +++ chrome/browser/browser.cc (working copy)
|
| @@ -67,7 +67,6 @@
|
| #include "chrome/browser/download/save_package.h"
|
| #include "chrome/browser/options_window.h"
|
| #include "chrome/browser/ssl/ssl_error_info.h"
|
| -#include "chrome/browser/tab_contents/web_contents_view.h"
|
| #include "chrome/browser/task_manager.h"
|
| #include "chrome/browser/user_data_manager.h"
|
| #include "chrome/browser/view_ids.h"
|
| @@ -1668,9 +1667,9 @@
|
| }
|
| }
|
|
|
| - // If this is an application we can only have one tab so a new tab always
|
| - // goes into a tabbed browser window.
|
| - if (disposition != NEW_WINDOW && type_ & TYPE_APP) {
|
| + // If this is not a normal window (such as a popup or an application), we can
|
| + // only have one tab so a new tab always goes into a tabbed browser window.
|
| + if (disposition != NEW_WINDOW && type_ != TYPE_NORMAL) {
|
| // If the disposition is OFF_THE_RECORD we don't want to create a new
|
| // browser that will itself create another OTR browser. This will result in
|
| // a browser leak (and crash below because no tab is created or selected).
|
|
|