chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript.mm - Issue 1644773003: Remove BrowserIterator

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/cocoa/applescript/browsercrapplication+applescript.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

« no previous file with comments | « chrome/browser/ui/browser_tab_strip_tracker.cc ('k') | chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac_browsertest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript.mm

diff --git a/chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript.mm b/chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript.mm

index 1736b9f1efccc3c9998039cd3df1d8d24b7f98d4..32d24f752d1869985c52ad53ea91b392b47877d6 100644

--- a/chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript.mm

+++ b/chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript.mm

@@ -11,7 +11,7 @@

#include "chrome/browser/profiles/profile.h"

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

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

-#include "chrome/browser/ui/browser_iterator.h"

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

#import "chrome/browser/ui/cocoa/applescript/bookmark_folder_applescript.h"

#import "chrome/browser/ui/cocoa/applescript/constants_applescript.h"

#import "chrome/browser/ui/cocoa/applescript/error_applescript.h"

@@ -27,13 +27,12 @@ using bookmarks::BookmarkModel;

arrayWithCapacity:chrome::GetTotalBrowserCount()];

// Iterate through all browsers and check if it closing,

// if not add it to list.

- for (chrome::BrowserIterator browserIterator; !browserIterator.done();

- browserIterator.Next()) {

- if ((*browserIterator)->IsAttemptingToCloseBrowser())

+ for (auto* browser : *BrowserList::GetInstance()) {

+ if (browser->IsAttemptingToCloseBrowser())

continue;

base::scoped_nsobject<WindowAppleScript> window(

- [[WindowAppleScript alloc] initWithBrowser:*browserIterator]);

+ [[WindowAppleScript alloc] initWithBrowser:browser]);

[window setContainer:NSApp

property:AppleScript::kWindowsProperty];

[appleScriptWindows addObject:window];