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

Unified Diff: chrome/browser/tabs/tab_strip_model_order_controller.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
« no previous file with comments | « chrome/browser/tabs/tab_strip_model.cc ('k') | chrome/browser/tabs/tab_strip_model_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/tabs/tab_strip_model_order_controller.cc
===================================================================
--- chrome/browser/tabs/tab_strip_model_order_controller.cc (revision 116288)
+++ chrome/browser/tabs/tab_strip_model_order_controller.cc (working copy)
@@ -7,6 +7,8 @@
#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
#include "content/browser/tab_contents/tab_contents.h"
+using content::NavigationController;
+
///////////////////////////////////////////////////////////////////////////////
// TabStripModelOrderController, public:
@@ -39,7 +41,7 @@
// tab, insert it adjacent to the tab that opened that link.
return tabstrip_->active_index() + delta;
}
- content::NavigationController* opener =
+ NavigationController* opener =
&tabstrip_->GetActiveTabContents()->web_contents()->GetController();
// Get the index of the next item opened by this tab, and insert after
// it...
@@ -69,12 +71,12 @@
int removing_index) const {
int tab_count = tabstrip_->count();
DCHECK(removing_index >= 0 && removing_index < tab_count);
- content::NavigationController* parent_opener =
+ NavigationController* parent_opener =
tabstrip_->GetOpenerOfTabContentsAt(removing_index);
// First see if the index being removed has any "child" tabs. If it does, we
// want to select the first in that child group, not the next tab in the same
// group of the removed tab.
- content::NavigationController* removed_controller =
+ NavigationController* removed_controller =
&tabstrip_->GetTabContentsAt(removing_index)->
web_contents()->GetController();
// The parent opener should never be the same as the controller being removed.
@@ -114,7 +116,7 @@
TabContentsWrapper* new_contents,
int index,
bool user_gesture) {
- content::NavigationController* old_opener = NULL;
+ NavigationController* old_opener = NULL;
if (old_contents) {
int index = tabstrip_->GetIndexOfTabContents(old_contents);
if (index != TabStripModel::kNoTab) {
@@ -126,8 +128,7 @@
tabstrip_->ForgetGroup(old_contents);
}
}
- content::NavigationController* new_opener =
- tabstrip_->GetOpenerOfTabContentsAt(index);
+ NavigationController* new_opener = tabstrip_->GetOpenerOfTabContentsAt(index);
if (user_gesture && new_opener != old_opener &&
((old_contents == NULL && new_opener == NULL) ||
« no previous file with comments | « chrome/browser/tabs/tab_strip_model.cc ('k') | chrome/browser/tabs/tab_strip_model_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698