diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-04 16:52:20 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-04 16:52:20 +0000 |
| commit | 6acde635328db851483aa3f5a13eba8a687fe29d (patch) | |
| tree | 966a1df295acd70d9e77209a538aa5201ebb330a /chrome/browser/extensions/extension_tab_util.cc | |
| parent | 908da49b07a50a4062c770be8e7fdf8dfe34517b (diff) | |
| download | chromium_src-6acde635328db851483aa3f5a13eba8a687fe29d.zip chromium_src-6acde635328db851483aa3f5a13eba8a687fe29d.tar.gz chromium_src-6acde635328db851483aa3f5a13eba8a687fe29d.tar.bz2 | |
Replace Browser::GetTabContentsAt with GetWebContentsAt and update all callers.
BUG=98716
TBR=joi
Review URL: http://codereview.chromium.org/9085006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116322 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 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/extensions/extension_tab_util.cc b/chrome/browser/extensions/extension_tab_util.cc index 32cb17f..8584282 100644 --- a/chrome/browser/extensions/extension_tab_util.cc +++ b/chrome/browser/extensions/extension_tab_util.cc @@ -6,7 +6,6 @@ #include "chrome/browser/extensions/extension_tab_util.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/tabs/tab_strip_model.h" -#include "content/browser/tab_contents/tab_contents.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/browser_list.h" @@ -14,6 +13,7 @@ #include "chrome/browser/extensions/extension_tabs_module_constants.h" #include "content/public/browser/favicon_status.h" #include "content/public/browser/navigation_entry.h" +#include "content/public/browser/web_contents.h" namespace keys = extension_tabs_module_constants; namespace errors = extension_manifest_errors; @@ -90,7 +90,7 @@ ListValue* ExtensionTabUtil::CreateTabList(const Browser* browser) { TabStripModel* tab_strip = browser->tabstrip_model(); for (int i = 0; i < tab_strip->count(); ++i) { tab_list->Append(ExtensionTabUtil::CreateTabValue( - tab_strip->GetTabContentsAt(i)->tab_contents(), tab_strip, i)); + tab_strip->GetTabContentsAt(i)->web_contents(), tab_strip, i)); } return tab_list; @@ -199,7 +199,7 @@ bool ExtensionTabUtil::GetDefaultTab(Browser* browser, *contents = browser->GetSelectedTabContentsWrapper(); if (*contents) { if (tab_id) - *tab_id = ExtensionTabUtil::GetTabId((*contents)->tab_contents()); + *tab_id = ExtensionTabUtil::GetTabId((*contents)->web_contents()); return true; } |