diff options
| author | stevenjb@google.com <stevenjb@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-19 23:57:57 +0000 |
|---|---|---|
| committer | stevenjb@google.com <stevenjb@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-19 23:57:57 +0000 |
| commit | 300d1e52088525a9ca6fc3b220ce85f7ac485bb2 (patch) | |
| tree | abf53d921bbe54495a37b5f1e7cd7fb7f137f952 /chrome/browser/ui/browser_navigator.cc | |
| parent | 7d06e052d0bc4c5f83f44831a3cd044cd77bc3bf (diff) | |
| download | chromium_src-300d1e52088525a9ca6fc3b220ce85f7ac485bb2.zip chromium_src-300d1e52088525a9ca6fc3b220ce85f7ac485bb2.tar.gz chromium_src-300d1e52088525a9ca6fc3b220ce85f7ac485bb2.tar.bz2 | |
Fix for regression: Any window of type APP should create APP_POPUP windows.
When code was moved from browser.cc to browser_navigator.cc, the logic for
spawning popup windows was either mis-copied or copied from a different code
path; any browser of TYPE_APP (e.g. TYPE_APP_POPUP) should create popup windows
of TYPE_APP_POPUP.
BUG=chromium-os:11040
TEST=See issue + UI auto tests
Review URL: http://codereview.chromium.org/6296011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71876 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/browser_navigator.cc')
| -rw-r--r-- | chrome/browser/ui/browser_navigator.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome/browser/ui/browser_navigator.cc b/chrome/browser/ui/browser_navigator.cc index 3c082d8..4b25ab0 100644 --- a/chrome/browser/ui/browser_navigator.cc +++ b/chrome/browser/ui/browser_navigator.cc @@ -161,9 +161,8 @@ Browser* GetBrowserForDisposition(browser::NavigateParams* params) { // Make a new popup window. Coerce app-style if |params->browser| or the // |source| represents an app. Browser::Type type = Browser::TYPE_POPUP; - if ((params->browser && params->browser->type() == Browser::TYPE_APP) || - (params->source_contents && - params->source_contents->is_app())) { + if ((params->browser && (params->browser->type() & Browser::TYPE_APP)) || + (params->source_contents && params->source_contents->is_app())) { type = Browser::TYPE_APP_POPUP; } if (profile) { |