chrome/browser/extensions/api/tabs/tabs_event_router.cc - Issue 1239643004: extensions: tabs: set tab id to -1 for app/devtools windows

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/api/tabs/tabs_event_router.cc

Issue 1239643004: extensions: tabs: set tab id to -1 for app/devtools windows (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: nits Created 5 years, 5 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/desktop_capture/desktop_capture_api.cc ('k') | chrome/browser/extensions/api/tabs/tabs_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/tabs/tabs_event_router.cc

diff --git a/chrome/browser/extensions/api/tabs/tabs_event_router.cc b/chrome/browser/extensions/api/tabs/tabs_event_router.cc

index c2bc47d3da0a3460b250b99021752a166a85fb5b..9c92ac294553b074a96bc70d6dea4d9d9d206c05 100644

--- a/chrome/browser/extensions/api/tabs/tabs_event_router.cc

+++ b/chrome/browser/extensions/api/tabs/tabs_event_router.cc

@@ -129,7 +129,7 @@ TabsEventRouter::TabsEventRouter(Profile* profile)

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

Browser* browser = *it;

- if (browser->tab_strip_model()) {

+ if (ExtensionTabUtil::BrowserSupportsTabs(browser)) {

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

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

int tab_id = ExtensionTabUtil::GetTabId(contents);

@@ -148,7 +148,8 @@ void TabsEventRouter::OnBrowserAdded(Browser* browser) {

}

void TabsEventRouter::RegisterForBrowserNotifications(Browser* browser) {

- if (!profile_->IsSameProfile(browser->profile()))

+ if (!profile_->IsSameProfile(browser->profile()) ||

+ !ExtensionTabUtil::BrowserSupportsTabs(browser))

return;

// Start listening to TabStripModel events for this browser.

TabStripModel* tab_strip = browser->tab_strip_model();