diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-30 18:53:28 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-30 18:53:28 +0000 |
| commit | 72f6797d566159af1fb25c680334e98c6dbbdd2f (patch) | |
| tree | e1f7d86fedc30387fc784618bda926d59d23859b /chrome/browser/extensions/extension_tab_util.cc | |
| parent | b80ec461c95510aaa218c4ebeb5b3c4752bb2610 (diff) | |
| download | chromium_src-72f6797d566159af1fb25c680334e98c6dbbdd2f.zip chromium_src-72f6797d566159af1fb25c680334e98c6dbbdd2f.tar.gz chromium_src-72f6797d566159af1fb25c680334e98c6dbbdd2f.tar.bz2 | |
Remove some TabContentses from extensions.
This is a removal from ExtensionTabUtil and then following dependencies.
BUG=107201
TEST=no visible change
Review URL: https://chromiumcodereview.appspot.com/11308012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164963 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_tab_util.cc')
| -rw-r--r-- | chrome/browser/extensions/extension_tab_util.cc | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/chrome/browser/extensions/extension_tab_util.cc b/chrome/browser/extensions/extension_tab_util.cc index c836b1b..4603a30 100644 --- a/chrome/browser/extensions/extension_tab_util.cc +++ b/chrome/browser/extensions/extension_tab_util.cc @@ -81,11 +81,10 @@ ListValue* ExtensionTabUtil::CreateTabList( ListValue* tab_list = new ListValue(); TabStripModel* tab_strip = browser->tab_strip_model(); for (int i = 0; i < tab_strip->count(); ++i) { - tab_list->Append(CreateTabValue( - tab_strip->GetTabContentsAt(i)->web_contents(), - tab_strip, - i, - extension)); + tab_list->Append(CreateTabValue(tab_strip->GetWebContentsAt(i), + tab_strip, + i, + extension)); } return tab_list; @@ -157,15 +156,15 @@ bool ExtensionTabUtil::GetTabStripModel(const WebContents* web_contents, } bool ExtensionTabUtil::GetDefaultTab(Browser* browser, - TabContents** contents, + WebContents** contents, int* tab_id) { DCHECK(browser); DCHECK(contents); - *contents = chrome::GetActiveTabContents(browser); + *contents = chrome::GetActiveWebContents(browser); if (*contents) { if (tab_id) - *tab_id = GetTabId((*contents)->web_contents()); + *tab_id = GetTabId(*contents); return true; } @@ -177,7 +176,7 @@ bool ExtensionTabUtil::GetTabById(int tab_id, bool include_incognito, Browser** browser, TabStripModel** tab_strip, - TabContents** contents, + WebContents** contents, int* tab_index) { Profile* incognito_profile = include_incognito && profile->HasOffTheRecordProfile() ? @@ -189,8 +188,8 @@ bool ExtensionTabUtil::GetTabById(int tab_id, target_browser->profile() == incognito_profile) { TabStripModel* target_tab_strip = target_browser->tab_strip_model(); for (int i = 0; i < target_tab_strip->count(); ++i) { - TabContents* target_contents = target_tab_strip->GetTabContentsAt(i); - if (SessionID::IdForTab(target_contents->web_contents()) == tab_id) { + WebContents* target_contents = target_tab_strip->GetWebContentsAt(i); + if (SessionID::IdForTab(target_contents) == tab_id) { if (browser) *browser = target_browser; if (tab_strip) |