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

Unified Diff: chrome/browser/tabs/tab_strip_model.cc

Issue 8983012: Get rid of content::NavigationController in cc file and use "using" instead. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: 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
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)
« no previous file with comments | « chrome/browser/sync/glue/session_change_processor.cc ('k') | chrome/browser/tabs/tab_strip_model_order_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698