chrome/browser/extensions/extension_tab_util.cc - Issue 9085006: Replace Browser::GetTabContentsAt with GetWebContentsAt and update all callers.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/extensions/extension_tab_util.cc

Issue 9085006: Replace Browser::GetTabContentsAt with GetWebContentsAt and update all callers. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: fix mac yet again Created 8 years, 12 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/extensions/extension_devtools_browsertests.cc ('k') | chrome/browser/extensions/isolated_app_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_tab_util.cc

===================================================================

--- chrome/browser/extensions/extension_tab_util.cc (revision 116244)

+++ chrome/browser/extensions/extension_tab_util.cc (working copy)

@@ -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 @@

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 @@

*contents = browser->GetSelectedTabContentsWrapper();

if (*contents) {

if (tab_id)

- *tab_id = ExtensionTabUtil::GetTabId((*contents)->tab_contents());

+ *tab_id = ExtensionTabUtil::GetTabId((*contents)->web_contents());

return true;

}