summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/browser_event_router.cc
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-14 18:38:10 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-14 18:38:10 +0000
commit3695357bc1e9a041a781411555ba39b7cd6319b8 (patch)
tree652a29cb30d99b472555a589d6aec7d0e899af97 /chrome/browser/extensions/browser_event_router.cc
parent85f2fcc7b577362dd1def5895d60ea70d6e6b8d0 (diff)
downloadchromium_src-3695357bc1e9a041a781411555ba39b7cd6319b8.zip
chromium_src-3695357bc1e9a041a781411555ba39b7cd6319b8.tar.gz
chromium_src-3695357bc1e9a041a781411555ba39b7cd6319b8.tar.bz2
Remove GetWebContentsAt from browser_tabstrip.
BUG=167548 TEST=no functional change Review URL: https://chromiumcodereview.appspot.com/11874002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@176688 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/browser_event_router.cc')
-rw-r--r--chrome/browser/extensions/browser_event_router.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/extensions/browser_event_router.cc b/chrome/browser/extensions/browser_event_router.cc
index e647b8f..d6d26ca 100644
--- a/chrome/browser/extensions/browser_event_router.cc
+++ b/chrome/browser/extensions/browser_event_router.cc
@@ -19,7 +19,6 @@
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_list.h"
-#include "chrome/browser/ui/browser_tabstrip.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
#include "chrome/common/extensions/extension.h"
#include "chrome/common/extensions/extension_constants.h"
@@ -90,7 +89,7 @@ BrowserEventRouter::BrowserEventRouter(Profile* profile)
Browser* browser = *iter;
if (browser->tab_strip_model()) {
for (int i = 0; i < browser->tab_strip_model()->count(); ++i) {
- WebContents* contents = chrome::GetWebContentsAt(browser, i);
+ WebContents* contents = browser->tab_strip_model()->GetWebContentsAt(i);
int tab_id = ExtensionTabUtil::GetTabId(contents);
tab_entries_[tab_id] = TabEntry();
}
@@ -110,10 +109,11 @@ void BrowserEventRouter::RegisterForBrowserNotifications(Browser* browser) {
if (!profile_->IsSameProfile(browser->profile()))
return;
// Start listening to TabStripModel events for this browser.
- browser->tab_strip_model()->AddObserver(this);
+ TabStripModel* tab_strip = browser->tab_strip_model();
+ tab_strip->AddObserver(this);
- for (int i = 0; i < browser->tab_strip_model()->count(); ++i) {
- RegisterForTabNotifications(chrome::GetWebContentsAt(browser, i));
+ for (int i = 0; i < tab_strip->count(); ++i) {
+ RegisterForTabNotifications(tab_strip->GetWebContentsAt(i));
}
}