diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-04 00:46:20 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-04 00:46:20 +0000 |
| commit | cdcb1dee07b6c8e7fe968b2a5f4199c9c8fb2323 (patch) | |
| tree | 4a9218cc8e53e78e565140e5e88d85c29280117e /chrome/browser/ui/browser.cc | |
| parent | 46a7e02c5bba1b9c68f86befaf586d0b17eb0b04 (diff) | |
| download | chromium_src-cdcb1dee07b6c8e7fe968b2a5f4199c9c8fb2323.zip chromium_src-cdcb1dee07b6c8e7fe968b2a5f4199c9c8fb2323.tar.gz chromium_src-cdcb1dee07b6c8e7fe968b2a5f4199c9c8fb2323.tar.bz2 | |
Convert WebContents to return a content::NavigationController instead of the implementation. Update all the headers in chrome to use the interface only. In a subsequent cl, I'll rename the implementation to NavigationControllerImpl and also get rid of content::NavigationController everywhere.
BUG=98716
TBR=joi
Review URL: http://codereview.chromium.org/8983010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116244 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/browser.cc')
| -rw-r--r-- | chrome/browser/ui/browser.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc index 5b344f8..2033b7a 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc @@ -146,12 +146,12 @@ #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/site_instance.h" #include "content/browser/tab_contents/interstitial_page.h" -#include "content/browser/tab_contents/navigation_controller.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/browser/tab_contents/tab_contents_view.h" #include "content/public/browser/devtools_manager.h" #include "content/public/browser/download_item.h" #include "content/public/browser/download_manager.h" +#include "content/public/browser/navigation_controller.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_service.h" @@ -1373,7 +1373,7 @@ bool Browser::CanRestoreTab() { bool Browser::NavigateToIndexWithDisposition(int index, WindowOpenDisposition disp) { - NavigationController& controller = + content::NavigationController& controller = GetOrCloneTabForDisposition(disp)->GetController(); if (index < 0 || index >= controller.GetEntryCount()) return false; @@ -3103,7 +3103,7 @@ TabContentsWrapper* Browser::CreateTabContentsForURL( } bool Browser::CanDuplicateContentsAt(int index) { - NavigationController& nc = GetTabContentsAt(index)->GetController(); + content::NavigationController& nc = GetTabContentsAt(index)->GetController(); return nc.GetWebContents() && nc.GetLastCommittedEntry(); } @@ -4596,7 +4596,7 @@ void Browser::UpdateCommandsForTabState() { return; // Navigation commands - NavigationController& nc = current_tab->GetController(); + content::NavigationController& nc = current_tab->GetController(); command_updater_.UpdateCommandEnabled(IDC_BACK, nc.CanGoBack()); command_updater_.UpdateCommandEnabled(IDC_FORWARD, nc.CanGoForward()); command_updater_.UpdateCommandEnabled(IDC_RELOAD, |