From 4ca153033f022dc6e11d6094daed41b1ed0a995f Mon Sep 17 00:00:00 2001 From: "jam@chromium.org" Date: Tue, 3 Jan 2012 05:53:20 +0000 Subject: Replace most of Browser::GetSelectedTabContents calls into Browser::GetSelectedWebContents. I've converted the easy ones, I'll do the ones with more dependencies in a separate change to keep things trivial to review. I considered taking out GetSelectedTabContents altogether and having people just use GetSelectedTabContentsWrapper()->web_contents() per the existing comment in browser.h, but there are a lot of callers and it seemed too long to type. BUG=98716 TBR=joi Review URL: http://codereview.chromium.org/9015022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116122 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/automation/automation_provider.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'chrome/browser/automation/automation_provider.cc') diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc index 9622c94..9d0ca8a 100644 --- a/chrome/browser/automation/automation_provider.cc +++ b/chrome/browser/automation/automation_provider.cc @@ -917,7 +917,7 @@ void AutomationProvider::ExecuteExtensionActionInActiveTabAsync( profile_->GetExtensionMessageService(); Browser* browser = browser_tracker_->GetResource(browser_handle); if (extension && service && message_service && browser) { - int tab_id = ExtensionTabUtil::GetTabId(browser->GetSelectedTabContents()); + int tab_id = ExtensionTabUtil::GetTabId(browser->GetSelectedWebContents()); if (extension->page_action()) { service->browser_event_router()->PageActionExecuted( browser->profile(), extension->id(), "action", tab_id, "", 1); -- cgit v1.1