diff options
| author | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-03 18:56:01 +0000 |
|---|---|---|
| committer | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-03 18:56:01 +0000 |
| commit | aca02cf3af06c48baa7f6b7f82d319ffc848fac6 (patch) | |
| tree | fb38528c2aac56d143857fd342c2b968674d5eaf /chrome/browser | |
| parent | 193ce83bda8ce011e572b1194ee09e000f205158 (diff) | |
| download | chromium_src-aca02cf3af06c48baa7f6b7f82d319ffc848fac6.zip chromium_src-aca02cf3af06c48baa7f6b7f82d319ffc848fac6.tar.gz chromium_src-aca02cf3af06c48baa7f6b7f82d319ffc848fac6.tar.bz2 | |
Fix DuplicateTab browser crash with Extension Window found during debugging.
|browser| would be NULL because we don't check if browser
supports tabstrip. So it would crash on line 2070 of browser.cc.
Also fixed some lint issues with include orders and duplication.
BUG=http://crbug.com/43095
TEST=Open Extension window, duplicate the tab in it (it should not crash).
Review URL: http://codereview.chromium.org/1878001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46256 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/browser.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc index cad0d63..a8fccd7 100644 --- a/chrome/browser/browser.cc +++ b/chrome/browser/browser.cc @@ -4,6 +4,11 @@ #include "chrome/browser/browser.h" +#if defined(OS_WIN) +#include <shellapi.h> +#include <windows.h> +#endif // OS_WIN + #include <algorithm> #include <string> @@ -89,11 +94,7 @@ #include "webkit/glue/window_open_disposition.h" #if defined(OS_WIN) -#include <windows.h> -#include <shellapi.h> - #include "app/win_util.h" -#include "chrome/browser/browser_url_handler.h" #include "chrome/browser/cert_store.h" #include "chrome/browser/child_process_host.h" #include "chrome/browser/download/save_package.h" @@ -2047,7 +2048,7 @@ void Browser::DuplicateContentsAt(int index) { DCHECK(contents); bool pinned = false; - if (type_ == TYPE_NORMAL) { + if (SupportsWindowFeature(FEATURE_TABSTRIP)) { // If this is a tabbed browser, just create a duplicate tab inside the same // window next to the tab being duplicated. new_contents = contents->Clone(); |