Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(216)

Unified Diff: chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_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
Index: chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.cc
diff --git a/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.cc b/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.cc
index f891d02e9b765d6a8420ca999b76b1d95e54eb32..b701a42c8e2e9ef510ccd96ac992e972b9421ae4 100644
--- a/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.cc
+++ b/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.cc
@@ -177,11 +177,7 @@ AppShortcutLauncherItemController::GetRunningApplications() {
if (!extension)
return items;
- const BrowserList* ash_browser_list =
- BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_ASH);
- for (BrowserList::const_iterator it = ash_browser_list->begin();
- it != ash_browser_list->end(); ++it) {
- Browser* browser = *it;
+ for (auto& browser : *BrowserList::GetInstance()) {
if (!launcher_controller()->IsBrowserFromActiveUser(browser))
continue;
TabStripModel* tab_strip = browser->tab_strip_model();
@@ -250,11 +246,10 @@ content::WebContents* AppShortcutLauncherItemController::GetLRUApplication() {
if (!extension)
return NULL;
- const BrowserList* ash_browser_list =
- BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_ASH);
- for (BrowserList::const_reverse_iterator
- it = ash_browser_list->begin_last_active();
- it != ash_browser_list->end_last_active(); ++it) {
+ const BrowserList* browser_list = BrowserList::GetInstance();
+ for (BrowserList::const_reverse_iterator it =
+ browser_list->begin_last_active();
+ it != browser_list->end_last_active(); ++it) {
Browser* browser = *it;
if (!CanBrowserBeUsedForDirectActivation(browser, launcher_controller()))
continue;
@@ -272,8 +267,8 @@ content::WebContents* AppShortcutLauncherItemController::GetLRUApplication() {
// Coming here our application was not in the LRU list. This could have
// happened because it did never get activated yet. So check the browser list
// as well.
- for (BrowserList::const_iterator it = ash_browser_list->begin();
- it != ash_browser_list->end(); ++it) {
+ for (BrowserList::const_iterator it = browser_list->begin();
+ it != browser_list->end(); ++it) {
Browser* browser = *it;
if (!CanBrowserBeUsedForDirectActivation(browser, launcher_controller()))
continue;

Powered by Google App Engine
This is Rietveld 408576698