chrome/browser/ui/browser_navigator.cc - Issue 6296011: Fix for regression: Any window of type APP should create APP_POPUP windows.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/browser_navigator.cc

Issue 6296011: Fix for regression: Any window of type APP should create APP_POPUP windows. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: Add BrowserNavigatorTest.Disposition_NewPopupFromAppPopup Created 9 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: chrome/browser/ui/browser_navigator.cc

diff --git a/chrome/browser/ui/browser_navigator.cc b/chrome/browser/ui/browser_navigator.cc

index 3c082d8f3cc861c835e248abb210b035a474ac42..4b25ab0f0f867e3c48c1fc936aa3f439c9f719cc 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) {

« no previous file with comments | « no previous file | chrome/browser/ui/browser_navigator_browsertest.cc » ('j') | no next file with comments »