chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.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/ash/launcher/chrome_launcher_controller_per_app.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/sync/test/integration/sync_test.cc ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc

diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc

index fdbb5d7904290f875ce1c0c2d9ff5a3134f8b3ab..89ab329b1fe188261461ac7de7bdef3e69430cec 100644

--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc

+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc

@@ -39,10 +39,12 @@

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

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

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

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

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

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

#include "chrome/browser/ui/extensions/application_launch.h"

#include "chrome/browser/ui/extensions/extension_enable_flow.h"

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

#include "chrome/browser/ui/tabs/tab_strip_model.h"

#include "chrome/browser/web_applications/web_app.h"

#include "chrome/common/chrome_notification_types.h"

@@ -1098,7 +1100,8 @@ void ChromeLauncherControllerPerApp::UpdateBrowserItemStatus() {

aura::Window* window = ash::wm::GetActiveWindow();

if (window && chrome::FindBrowserWithWindow(window)) {

browser_status = ash::STATUS_ACTIVE;

- } else if (!BrowserList::empty()) {

+ } else if (!chrome::BrowserListImpl::GetInstance(

+ chrome::HOST_DESKTOP_TYPE_ASH)->empty()) {

browser_status = ash::STATUS_RUNNING;

} else {

browser_status = ash::STATUS_CLOSED;