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(); |