From e89cfcb9090e8c98129ae9160c513f504db74599 Mon Sep 17 00:00:00 2001 From: "avi@chromium.org" Date: Sun, 11 Nov 2012 14:47:24 +0000 Subject: Remove TabContents from TabStripModelObserver::TabDetachedAt. BUG=107201 TEST=no visible change Review URL: https://chromiumcodereview.appspot.com/11293205 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167122 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/extensions/browser_event_router.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to '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 439fae9..5c42f4a 100644 --- a/chrome/browser/extensions/browser_event_router.cc +++ b/chrome/browser/extensions/browser_event_router.cc @@ -206,24 +206,24 @@ void BrowserEventRouter::TabInsertedAt(WebContents* contents, EventRouter::USER_GESTURE_UNKNOWN); } -void BrowserEventRouter::TabDetachedAt(TabContents* contents, int index) { - if (!GetTabEntry(contents->web_contents())) { +void BrowserEventRouter::TabDetachedAt(WebContents* contents, int index) { + if (!GetTabEntry(contents)) { // The tab was removed. Don't send detach event. return; } scoped_ptr args(new ListValue()); - args->Append(Value::CreateIntegerValue( - ExtensionTabUtil::GetTabId(contents->web_contents()))); + args->Append(Value::CreateIntegerValue(ExtensionTabUtil::GetTabId(contents))); DictionaryValue* object_args = new DictionaryValue(); object_args->Set(tab_keys::kOldWindowIdKey, Value::CreateIntegerValue( - ExtensionTabUtil::GetWindowIdOfTab(contents->web_contents()))); + ExtensionTabUtil::GetWindowIdOfTab(contents))); object_args->Set(tab_keys::kOldPositionKey, Value::CreateIntegerValue( index)); args->Append(object_args); - DispatchEvent(contents->profile(), events::kOnTabDetached, args.Pass(), + Profile* profile = Profile::FromBrowserContext(contents->GetBrowserContext()); + DispatchEvent(profile, events::kOnTabDetached, args.Pass(), EventRouter::USER_GESTURE_UNKNOWN); } -- cgit v1.1