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

Unified Diff: chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac_browsertest.mm

Issue 1644773003: Remove BrowserIterator (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@host-desktop-1
Patch Set: . 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/cocoa/apps/app_shim_menu_controller_mac_browsertest.mm
diff --git a/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac_browsertest.mm b/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac_browsertest.mm
index cc8c4a2228fd44a17163acdd531ab3ebd7260d78..8035dfcd4182973d0ab0728442d8aa171796c2dd 100644
--- a/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac_browsertest.mm
+++ b/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac_browsertest.mm
@@ -18,7 +18,7 @@
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/launch_util.h"
#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/browser_iterator.h"
+#include "chrome/browser/ui/browser_list.h"
#include "chrome/browser/ui/browser_window.h"
#include "chrome/common/chrome_switches.h"
#include "extensions/browser/app_window/app_window_registry.h"
@@ -158,7 +158,8 @@ IN_PROC_BROWSER_TEST_F(AppShimMenuControllerBrowserTest,
// When a browser window is focused, the menu items for the app should be
// removed.
- BrowserWindow* chrome_window = chrome::BrowserIterator()->window();
+ BrowserWindow* chrome_window =
+ (*BrowserList::GetInstance()->begin())->window();
[[NSNotificationCenter defaultCenter]
postNotificationName:NSWindowDidBecomeMainNotification
object:chrome_window->GetNativeWindow()];
@@ -192,7 +193,8 @@ IN_PROC_BROWSER_TEST_F(AppShimMenuControllerBrowserTest,
CheckHasAppMenus(app_1_);
// Closing a background window without focusing it should not change menus.
- BrowserWindow* chrome_window = chrome::BrowserIterator()->window();
+ BrowserWindow* chrome_window =
+ (*BrowserList::GetInstance()->begin())->window();
chrome_window->Close();
[[NSNotificationCenter defaultCenter]
postNotificationName:NSWindowWillCloseNotification
@@ -245,7 +247,7 @@ IN_PROC_BROWSER_TEST_F(AppShimMenuControllerBrowserTest,
SetUpApps(PACKAGED_1 | PACKAGED_2);
FirstWindowForApp(app_2_)->GetBaseWindow()->Close();
- chrome::BrowserIterator()->window()->Close();
+ (*BrowserList::GetInstance()->begin())->window()->Close();
NSWindow* app_1_window = FirstWindowForApp(app_1_)->GetNativeWindow();
ui::test::ScopedFakeNSWindowFocus fake_focus;

Powered by Google App Engine
This is Rietveld 408576698