diff options
Diffstat (limited to 'chrome/browser/tabs/tab_strip_model.cc')
| -rw-r--r-- | chrome/browser/tabs/tab_strip_model.cc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/chrome/browser/tabs/tab_strip_model.cc b/chrome/browser/tabs/tab_strip_model.cc index b730ee5..7837cff 100644 --- a/chrome/browser/tabs/tab_strip_model.cc +++ b/chrome/browser/tabs/tab_strip_model.cc @@ -144,14 +144,14 @@ void TabStripModel::InsertTabContentsAt(int index, ForgetAllOpeners(); } // Anything opened by a link we deem to have an opener. - data->SetGroup(&selected_contents->tab_contents()->controller()); + data->SetGroup(&selected_contents->tab_contents()->GetController()); } else if ((add_types & ADD_INHERIT_OPENER) && selected_contents) { if (active) { // Forget any existing relationships, we don't want to make things too // confusing by having multiple groups active at the same time. ForgetAllOpeners(); } - data->opener = &selected_contents->tab_contents()->controller(); + data->opener = &selected_contents->tab_contents()->GetController(); } contents_data_.insert(contents_data_.begin() + index, data); @@ -175,7 +175,7 @@ TabContentsWrapper* TabStripModel::ReplaceTabContentsAt( TabContentsWrapper* old_contents = GetContentsAt(index); ForgetOpenersAndGroupsReferencing( - &(old_contents->tab_contents()->controller())); + &(old_contents->tab_contents()->GetController())); contents_data_[index]->contents = new_contents; @@ -215,14 +215,14 @@ TabContentsWrapper* TabStripModel::DiscardTabContentsAt(int index) { NULL /* session_storage_namespace */)); TabContentsWrapper* old_contents = GetContentsAt(index); NavigationEntry* old_nav_entry = - old_contents->tab_contents()->controller().GetActiveEntry(); + old_contents->tab_contents()->GetController().GetActiveEntry(); if (old_nav_entry) { // Set the new tab contents to reload this URL when clicked. // This also allows the tab to keep drawing the favicon and page title. NavigationEntry* new_nav_entry = new NavigationEntry(*old_nav_entry); std::vector<NavigationEntry*> entries; entries.push_back(new_nav_entry); - null_contents->tab_contents()->controller().Restore(0, false, &entries); + null_contents->tab_contents()->GetController().Restore(0, false, &entries); } ReplaceTabContentsAt(index, null_contents); // Mark the tab so it will reload when we click. @@ -243,7 +243,7 @@ TabContentsWrapper* TabStripModel::DetachTabContentsAt(int index) { delete contents_data_.at(index); contents_data_.erase(contents_data_.begin() + index); ForgetOpenersAndGroupsReferencing( - &(removed_contents->tab_contents()->controller())); + &(removed_contents->tab_contents()->GetController())); if (empty()) closing_all_ = true; FOR_EACH_OBSERVER(TabStripModelObserver, observers_, @@ -389,7 +389,7 @@ int TabStripModel::GetIndexOfController( int index = 0; TabContentsDataVector::const_iterator iter = contents_data_.begin(); for (; iter != contents_data_.end(); ++iter, ++index) { - if (&(*iter)->contents->tab_contents()->controller() == controller) + if (&(*iter)->contents->tab_contents()->GetController() == controller) return index; } return kNoTab; @@ -846,7 +846,7 @@ void TabStripModel::ExecuteContextMenuCommand( TabContentsWrapper* tab = GetTabContentsAt(indices[i]); if (tab && tab->tab_contents()->GetDelegate()->CanReloadContents( tab->tab_contents())) { - tab->tab_contents()->controller().Reload(true); + tab->tab_contents()->GetController().Reload(true); } } break; @@ -1089,7 +1089,7 @@ void TabStripModel::GetIndicesWithSameOpener(int index, NavigationController* opener = contents_data_[index]->group; if (!opener) { // If there is no group, find all tabs with the selected tab as the opener. - opener = &(GetTabContentsAt(index)->tab_contents()->controller()); + opener = &(GetTabContentsAt(index)->tab_contents()->GetController()); if (!opener) return; } @@ -1097,7 +1097,7 @@ void TabStripModel::GetIndicesWithSameOpener(int index, if (i == index) continue; if (contents_data_[i]->group == opener || - &(GetTabContentsAt(i)->tab_contents()->controller()) == opener) { + &(GetTabContentsAt(i)->tab_contents()->GetController()) == opener) { indices->push_back(i); } } @@ -1118,7 +1118,7 @@ bool TabStripModel::IsNewTabAtEndOfTabStrip( return url.SchemeIs(chrome::kChromeUIScheme) && url.host() == chrome::kChromeUINewTabHost && contents == GetContentsAt(count() - 1) && - contents->tab_contents()->controller().entry_count() == 1; + contents->tab_contents()->GetController().entry_count() == 1; } bool TabStripModel::InternalCloseTabs(const std::vector<int>& in_indices, |