chrome/browser/extensions/browser_event_router.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/extensions/browser_event_router.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/extensions/api/web_navigation/web_navigation_api.cc ('k') | chrome/browser/extensions/extension_tab_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/browser_event_router.cc

diff --git a/chrome/browser/extensions/browser_event_router.cc b/chrome/browser/extensions/browser_event_router.cc

index c41a8dd723e36a7b5d35121db46ae9737edc3fd7..7b701f2ef50a5f6a44134a713bc1021fcc6302fb 100644

--- a/chrome/browser/extensions/browser_event_router.cc

+++ b/chrome/browser/extensions/browser_event_router.cc

@@ -18,6 +18,7 @@

#include "chrome/browser/extensions/window_controller.h"

#include "chrome/browser/profiles/profile.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/common/extensions/api/extension_action/action_info.h"

@@ -81,12 +82,11 @@ BrowserEventRouter::BrowserEventRouter(Profile* profile)

// Init() can happen after the browser is running, so catch up with any

// windows that already exist.

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

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

- RegisterForBrowserNotifications(*iter);

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

+ RegisterForBrowserNotifications(*it);

// Also catch up our internal bookkeeping of tab entries.

- Browser* browser = *iter;

+ Browser* browser = *it;

if (browser->tab_strip_model()) {

for (int i = 0; i < browser->tab_strip_model()->count(); ++i) {

WebContents* contents = browser->tab_strip_model()->GetWebContentsAt(i);