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

Unified Diff: chrome/browser/ui/browser.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/ui/auto_login_prompter.cc ('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 116288)
+++ chrome/browser/ui/browser.cc (working copy)
@@ -207,6 +207,7 @@
#endif
using base::TimeDelta;
+using content::NavigationController;
using content::NavigationEntry;
using content::OpenURLParams;
using content::PluginService;
@@ -1179,7 +1180,7 @@
}
int Browser::GetIndexOfController(
- const content::NavigationController* controller) const {
+ const NavigationController* controller) const {
return tab_handler_->GetTabStripModel()->GetIndexOfController(controller);
}
@@ -1373,7 +1374,7 @@
bool Browser::NavigateToIndexWithDisposition(int index,
WindowOpenDisposition disp) {
- content::NavigationController& controller =
+ NavigationController& controller =
GetOrCloneTabForDisposition(disp)->GetController();
if (index < 0 || index >= controller.GetEntryCount())
return false;
@@ -2521,7 +2522,7 @@
// static
Browser* Browser::GetBrowserForController(
- const content::NavigationController* controller, int* index_result) {
+ const NavigationController* controller, int* index_result) {
BrowserList::const_iterator it;
for (it = BrowserList::begin(); it != BrowserList::end(); ++it) {
int index = (*it)->tab_handler_->GetTabStripModel()->GetIndexOfController(
@@ -3103,7 +3104,7 @@
}
bool Browser::CanDuplicateContentsAt(int index) {
- content::NavigationController& nc = GetTabContentsAt(index)->GetController();
+ NavigationController& nc = GetTabContentsAt(index)->GetController();
return nc.GetWebContents() && nc.GetLastCommittedEntry();
}
@@ -3273,7 +3274,7 @@
fullscreen_controller_->OnTabClosing(contents->tab_contents());
content::NotificationService::current()->Notify(
content::NOTIFICATION_TAB_CLOSING,
- content::Source<content::NavigationController>(
+ content::Source<NavigationController>(
&contents->web_contents()->GetController()),
content::NotificationService::NoDetails());
@@ -4109,7 +4110,7 @@
// closing of this one.
if (GetSelectedWebContents() &&
&GetSelectedWebContents()->GetController() ==
- content::Source<content::NavigationController>(source).ptr())
+ content::Source<NavigationController>(source).ptr())
UpdateToolbar(false);
break;
@@ -4596,7 +4597,7 @@
return;
// Navigation commands
- content::NavigationController& nc = current_tab->GetController();
+ NavigationController& nc = current_tab->GetController();
command_updater_.UpdateCommandEnabled(IDC_BACK, nc.CanGoBack());
command_updater_.UpdateCommandEnabled(IDC_FORWARD, nc.CanGoForward());
command_updater_.UpdateCommandEnabled(IDC_RELOAD,
« no previous file with comments | « chrome/browser/ui/auto_login_prompter.cc ('k') | chrome/browser/ui/browser_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698