Index: chrome/browser/tabs/tab_strip_model.cc |
=================================================================== |
--- chrome/browser/tabs/tab_strip_model.cc (revision 116288) |
+++ chrome/browser/tabs/tab_strip_model.cc (working copy) |
@@ -34,6 +34,7 @@ |
#include "content/public/browser/user_metrics.h" |
#include "content/public/browser/web_contents_delegate.h" |
+using content::NavigationController; |
using content::NavigationEntry; |
using content::UserMetricsAction; |
using content::WebContents; |
@@ -388,7 +389,7 @@ |
} |
int TabStripModel::GetIndexOfController( |
- const content::NavigationController* controller) const { |
+ const NavigationController* controller) const { |
int index = 0; |
TabContentsDataVector::const_iterator iter = contents_data_.begin(); |
for (; iter != contents_data_.end(); ++iter, ++index) { |
@@ -432,14 +433,13 @@ |
return false; |
} |
-content::NavigationController* TabStripModel::GetOpenerOfTabContentsAt( |
- int index) { |
+NavigationController* TabStripModel::GetOpenerOfTabContentsAt(int index) { |
DCHECK(ContainsIndex(index)); |
return contents_data_.at(index)->opener; |
} |
int TabStripModel::GetIndexOfNextTabContentsOpenedBy( |
- const content::NavigationController* opener, |
+ const NavigationController* opener, |
int start_index, |
bool use_group) const { |
DCHECK(opener); |
@@ -459,8 +459,7 @@ |
} |
int TabStripModel::GetIndexOfFirstTabContentsOpenedBy( |
- const content::NavigationController* opener, |
- int start_index) const { |
+ const NavigationController* opener, int start_index) const { |
DCHECK(opener); |
DCHECK(ContainsIndex(start_index)); |
@@ -472,7 +471,7 @@ |
} |
int TabStripModel::GetIndexOfLastTabContentsOpenedBy( |
- const content::NavigationController* opener, int start_index) const { |
+ const NavigationController* opener, int start_index) const { |
DCHECK(opener); |
DCHECK(ContainsIndex(start_index)); |
@@ -1092,7 +1091,7 @@ |
void TabStripModel::GetIndicesWithSameOpener(int index, |
std::vector<int>* indices) { |
- content::NavigationController* opener = contents_data_[index]->group; |
+ 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()->GetController()); |
@@ -1321,13 +1320,13 @@ |
// static |
bool TabStripModel::OpenerMatches(const TabContentsData* data, |
- const content::NavigationController* opener, |
+ const NavigationController* opener, |
bool use_group) { |
return data->opener == opener || (use_group && data->group == opener); |
} |
void TabStripModel::ForgetOpenersAndGroupsReferencing( |
- const content::NavigationController* tab) { |
+ const NavigationController* tab) { |
for (TabContentsDataVector::const_iterator i = contents_data_.begin(); |
i != contents_data_.end(); ++i) { |
if ((*i)->group == tab) |