diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-28 21:04:23 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-28 21:04:23 +0000 |
| commit | 10f417c53722348c4452dc22e1a0dd18c0e4b140 (patch) | |
| tree | 470c5574d9d2ef9c7ba62951868149e70169b1a5 /chrome/browser/external_tab_container_win.cc | |
| parent | a47fccd356705a7d92cc83b03150c9782167f8c4 (diff) | |
| download | chromium_src-10f417c53722348c4452dc22e1a0dd18c0e4b140.zip chromium_src-10f417c53722348c4452dc22e1a0dd18c0e4b140.tar.gz chromium_src-10f417c53722348c4452dc22e1a0dd18c0e4b140.tar.bz2 | |
Rename NavigationController to NavigationControllerImpl and put it into the content namespace. Also make all users of content::NavigationController interface use the "using" keyword so they don't have to put content:: everywhere (similar to other Content API and WebKit API classes).
BUG=98716
TBR=joi
Review URL: http://codereview.chromium.org/8956059
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115916 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/external_tab_container_win.cc')
| -rw-r--r-- | chrome/browser/external_tab_container_win.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/external_tab_container_win.cc b/chrome/browser/external_tab_container_win.cc index 980f616..a83e49d 100644 --- a/chrome/browser/external_tab_container_win.cc +++ b/chrome/browser/external_tab_container_win.cc @@ -67,6 +67,7 @@ #include "ui/views/layout/grid_layout.h" using content::BrowserThread; +using content::NavigationEntry; using content::OpenURLParams; using content::SSLStatus; using content::WebContents; @@ -956,7 +957,7 @@ bool ExternalTabContainer::InitNavigationInfo(NavigationInfo* nav_info, content::NavigationType nav_type, int relative_offset) { DCHECK(nav_info); - content::NavigationEntry* entry = + NavigationEntry* entry = tab_contents_->tab_contents()->GetController().GetActiveEntry(); // If this is very early in the game then we may not have an entry. if (!entry) |