chrome/browser/automation/automation_util.cc - Issue 12114034: Swap BrowserList::const_iterator for the multi-desktop aware BrowserIterator in many scenarios.

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/automation/automation_util.cc

Issue 12114034: Swap BrowserList::const_iterator for the multi-desktop aware BrowserIterator in many scenarios. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 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/automation/automation_provider_observers.cc ('k') | chrome/browser/automation/testing_automation_provider.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/automation/automation_util.cc

diff --git a/chrome/browser/automation/automation_util.cc b/chrome/browser/automation/automation_util.cc

index 288a9d9ac60146baf5345cd88a3bad3cce500e73..62cedf9d80b1218514d83a40388849e393edf095 100644

--- a/chrome/browser/automation/automation_util.cc

+++ b/chrome/browser/automation/automation_util.cc

@@ -26,6 +26,7 @@

#include "chrome/browser/sessions/session_tab_helper.h"

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

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

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

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

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

#include "chrome/browser/view_type_utils.h"

@@ -204,9 +205,8 @@ Profile* GetCurrentProfileOnChromeOS(std::string* error_message) {

#endif // defined(OS_CHROMEOS)

Browser* GetBrowserForTab(WebContents* tab) {

- BrowserList::const_iterator browser_iter = BrowserList::begin();

- for (; browser_iter != BrowserList::end(); ++browser_iter) {

- Browser* browser = *browser_iter;

+ for (chrome::BrowserIterator it; !it.done(); it.Next()) {

+ Browser* browser = *it;

for (int tab_index = 0;

tab_index < browser->tab_strip_model()->count();

++tab_index) {

@@ -509,9 +509,8 @@ bool GetTabForId(const AutomationId& id, WebContents** tab) {

printing::PrintPreviewDialogController* preview_controller =

printing::PrintPreviewDialogController::GetInstance();

- BrowserList::const_iterator iter = BrowserList::begin();

- for (; iter != BrowserList::end(); ++iter) {

- Browser* browser = *iter;

+ for (chrome::BrowserIterator it; !it.done(); it.Next()) {

+ Browser* browser = *it;

for (int tab_index = 0;

tab_index < browser->tab_strip_model()->count();

++tab_index) {