chrome/browser/ui/window_sizer/window_sizer.cc - Issue 107273002: Merge 236134 "Ensure that the first browser window which is crea..."

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/window_sizer/window_sizer.cc

Issue 107273002: Merge 236134 "Ensure that the first browser window which is crea..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1700/src/

Patch Set: Created 7 years 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

« no previous file with comments | « chrome/browser/metro_viewer/chrome_metro_viewer_process_host_aurawin.cc ('k') | chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/window_sizer/window_sizer.cc

===================================================================

--- chrome/browser/ui/window_sizer/window_sizer.cc (revision 239045)

+++ chrome/browser/ui/window_sizer/window_sizer.cc (working copy)

@@ -188,8 +188,7 @@

if (IsTabbedBrowserInAsh()) {

GetTabbedBrowserBoundsAsh(bounds, show_state);

return;

- } else if (chrome::ShouldOpenAshOnStartup() &&

- browser_ && browser_->host_desktop_type() ==

+ } else if (browser_ && browser_->host_desktop_type() ==

chrome::HOST_DESKTOP_TYPE_ASH) {

// In ash, saved show state takes precidence. If you have a

// question or an issue, please contact oshima@chromium.org.

@@ -399,17 +398,13 @@

#if defined(USE_ASH)

bool WindowSizer::IsTabbedBrowserInAsh() const {

- // TODO(beng): insufficient but currently necessary. http://crbug.com/133312

- return chrome::ShouldOpenAshOnStartup() &&

- browser_ &&

+ return browser_ &&

browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH &&

browser_->is_type_tabbed();

}

bool WindowSizer::IsPopupBrowserInAsh() const {

- // TODO(beng): insufficient but currently necessary. http://crbug.com/133312

- return chrome::ShouldOpenAshOnStartup() &&

- browser_ &&

+ return browser_ &&

browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH &&

browser_->is_type_popup();

}