chrome/browser/ui/browser.cc - Issue 12212120: Replace most BrowserList::empty() and BrowserList::size() calls by multi-desktop aware calls.

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

Issue 12212120: Replace most BrowserList::empty() and BrowserList::size() calls by multi-desktop aware calls. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: merge up to r182110 Created 7 years, 10 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

« no previous file with comments | « chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app_unittest.cc ('k') | chrome/browser/ui/browser_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/browser.cc

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

index 1e36475c350b28db8a1a8743fd5d8737fc30418f..5e80a7cbf702631a51f68e69e2389d88dca3ad04 100644

--- a/chrome/browser/ui/browser.cc

+++ b/chrome/browser/ui/browser.cc

@@ -95,6 +95,7 @@

#include "chrome/browser/ui/browser_instant_controller.h"

#include "chrome/browser/ui/browser_iterator.h"

#include "chrome/browser/ui/browser_list.h"

+#include "chrome/browser/ui/browser_list_impl.h"

#include "chrome/browser/ui/browser_navigator.h"

#include "chrome/browser/ui/browser_tab_contents.h"

#include "chrome/browser/ui/browser_tab_restore_service_delegate.h"

@@ -632,8 +633,10 @@ void Browser::OnWindowClosing() {

bool should_quit_if_last_browser =

browser_shutdown::IsTryingToQuit() || !chrome::WillKeepAlive();

- if (should_quit_if_last_browser && BrowserList::size() == 1)

+ if (should_quit_if_last_browser &&

+ chrome::BrowserListImpl::GetInstance(host_desktop_type_)->size() == 1) {

browser_shutdown::OnShutdownStarting(browser_shutdown::WINDOW_CLOSE);

+ }

// Don't use GetForProfileIfExisting here, we want to force creation of the

// session service so that user can restore what was open.