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

Unified Diff: chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.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/chrome_launcher_controller_browsertest.cc
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc
index ea38e38924ca11b2fecc01f4123777498742a165..d30f677cdae4ef8f9d908622787a283fbc14bee4 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc
@@ -1633,13 +1633,11 @@ IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTest, ActivateAfterSessionRestore) {
EXPECT_EQ(chrome::FindBrowserWithWindow(ash::wm::GetActiveWindow()),
browser());
// Check that the LRU browser list does only contain the original browser.
- BrowserList* ash_browser_list =
- BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_ASH);
- BrowserList::const_reverse_iterator it =
- ash_browser_list->begin_last_active();
+ BrowserList* browser_list = BrowserList::GetInstance();
+ BrowserList::const_reverse_iterator it = browser_list->begin_last_active();
EXPECT_EQ(*it, browser());
++it;
- EXPECT_EQ(it, ash_browser_list->end_last_active());
+ EXPECT_EQ(it, browser_list->end_last_active());
// Now request to either activate an existing app or create a new one.
LauncherItemController* item_controller =
@@ -2150,11 +2148,10 @@ IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTest, V1AppNavigation) {
// Find the browser which holds our app.
Browser* app_browser = NULL;
- const BrowserList* ash_browser_list =
- BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_ASH);
+ const BrowserList* browser_list = BrowserList::GetInstance();
for (BrowserList::const_reverse_iterator it =
- ash_browser_list->begin_last_active();
- it != ash_browser_list->end_last_active() && !app_browser; ++it) {
+ browser_list->begin_last_active();
+ it != browser_list->end_last_active() && !app_browser; ++it) {
if ((*it)->is_app()) {
app_browser = *it;
break;

Powered by Google App Engine
This is Rietveld 408576698