Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(583)

Unified Diff: chrome/browser/ui/browser.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/ui/browser.h ('k') | chrome/browser/ui/browser_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/browser.cc
===================================================================
--- chrome/browser/ui/browser.cc (revision 116244)
+++ chrome/browser/ui/browser.cc (working copy)
@@ -1196,10 +1196,10 @@
return tabstrip_model()->GetTabContentsAt(index);
}
-TabContents* Browser::GetTabContentsAt(int index) const {
+WebContents* Browser::GetWebContentsAt(int index) const {
TabContentsWrapper* wrapper = tabstrip_model()->GetTabContentsAt(index);
if (wrapper)
- return wrapper->tab_contents();
+ return wrapper->web_contents();
return NULL;
}
@@ -1287,7 +1287,7 @@
window_->ToolbarSizeChanged(is_animating);
}
-TabContents* Browser::AddRestoredTab(
+WebContents* Browser::AddRestoredTab(
const std::vector<TabNavigation>& navigations,
int tab_index,
int selected_navigation,
@@ -1303,7 +1303,7 @@
MSG_ROUTING_NONE,
GetSelectedWebContents(),
session_storage_namespace);
- TabContents* new_tab = wrapper->tab_contents();
+ WebContents* new_tab = wrapper->web_contents();
wrapper->extension_tab_helper()->SetExtensionAppById(extension_app_id);
std::vector<NavigationEntry*> entries;
TabNavigation::CreateNavigationEntriesFromTabNavigations(
@@ -3103,7 +3103,7 @@
}
bool Browser::CanDuplicateContentsAt(int index) {
- content::NavigationController& nc = GetTabContentsAt(index)->GetController();
+ content::NavigationController& nc = GetWebContentsAt(index)->GetController();
return nc.GetWebContents() && nc.GetLastCommittedEntry();
}
@@ -4811,7 +4811,7 @@
i != scheduled_updates_.end(); ++i) {
bool found = false;
for (int tab = 0; tab < tab_count(); tab++) {
- if (GetTabContentsAt(tab) == i->first) {
+ if (GetWebContentsAt(tab) == i->first) {
found = true;
break;
}
« no previous file with comments | « chrome/browser/ui/browser.h ('k') | chrome/browser/ui/browser_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698