diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-13 10:32:12 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-13 10:32:12 +0000 |
| commit | 8e707799d4c2e3dd501a2df1b4e25c3e41eca5cb (patch) | |
| tree | a5d42eb292b0d59f8d14142d26c04eee18b07b5b /chrome/browser/extensions/browser_event_router.cc | |
| parent | 3abdff2beb28e73a6bc316baf849ef2d6ba078c4 (diff) | |
| download | chromium_src-8e707799d4c2e3dd501a2df1b4e25c3e41eca5cb.zip chromium_src-8e707799d4c2e3dd501a2df1b4e25c3e41eca5cb.tar.gz chromium_src-8e707799d4c2e3dd501a2df1b4e25c3e41eca5cb.tar.bz2 | |
Remove TabContents from TabStripModelObserver::ActiveTabChanged.
BUG=107201
TEST=no visible change
Review URL: https://chromiumcodereview.appspot.com/11364196
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167359 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/browser_event_router.cc')
| -rw-r--r-- | chrome/browser/extensions/browser_event_router.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/chrome/browser/extensions/browser_event_router.cc b/chrome/browser/extensions/browser_event_router.cc index c7c9d49..73f8639 100644 --- a/chrome/browser/extensions/browser_event_router.cc +++ b/chrome/browser/extensions/browser_event_router.cc @@ -250,22 +250,23 @@ void BrowserEventRouter::TabClosingAt(TabStripModel* tab_strip_model, UnregisterForTabNotifications(contents); } -void BrowserEventRouter::ActiveTabChanged(TabContents* old_contents, - TabContents* new_contents, +void BrowserEventRouter::ActiveTabChanged(WebContents* old_contents, + WebContents* new_contents, int index, bool user_gesture) { scoped_ptr<ListValue> args(new ListValue()); - int tab_id = ExtensionTabUtil::GetTabId(new_contents->web_contents()); + int tab_id = ExtensionTabUtil::GetTabId(new_contents); args->Append(Value::CreateIntegerValue(tab_id)); DictionaryValue* object_args = new DictionaryValue(); object_args->Set(tab_keys::kWindowIdKey, Value::CreateIntegerValue( - ExtensionTabUtil::GetWindowIdOfTab(new_contents->web_contents()))); + ExtensionTabUtil::GetWindowIdOfTab(new_contents))); args->Append(object_args); // The onActivated event replaced onActiveChanged and onSelectionChanged. The // deprecated events take two arguments: tabId, {windowId}. - Profile* profile = new_contents->profile(); + Profile* profile = + Profile::FromBrowserContext(new_contents->GetBrowserContext()); EventRouter::UserGestureState gesture = user_gesture ? EventRouter::USER_GESTURE_ENABLED : EventRouter::USER_GESTURE_NOT_ENABLED; DispatchEvent(profile, events::kOnTabSelectionChanged, |