chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc - Issue 1637943003: Remove HostDesktopType from BrowserList::GetInstance()

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

Issue 1637943003: Remove HostDesktopType from BrowserList::GetInstance() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@screen-wrapper-land

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

« no previous file with comments | « chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.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.cc

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

index 128de1de23625981a0d69ba19248634a00a68b94..3a756d2922187c7f90922ef2e0cd4eb9f68182bf 100644

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

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

@@ -2143,12 +2143,11 @@ void ChromeLauncherController::CloseWindowedAppsFromRemovedExtension(

const Profile* profile) {

// This function cannot rely on the controller's enumeration functionality

// since the extension has already be unloaded.

- const BrowserList* ash_browser_list =

- BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_ASH);

+ const BrowserList* browser_list = BrowserList::GetInstance();

std::vector<Browser*> browser_to_close;

- for (BrowserList::const_reverse_iterator

- it = ash_browser_list->begin_last_active();

- it != ash_browser_list->end_last_active(); ++it) {

+ for (BrowserList::const_reverse_iterator it =

+ browser_list->begin_last_active();

+ it != browser_list->end_last_active(); ++it) {

Browser* browser = *it;

if (!browser->is_type_tabbed() && browser->is_type_popup() &&

browser->is_app() &&