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/sessions/tab_restore_service.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/sessions/tab_restore_service.cc')
| -rw-r--r-- | chrome/browser/sessions/tab_restore_service.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/sessions/tab_restore_service.cc b/chrome/browser/sessions/tab_restore_service.cc index f6e9646..1fed2156 100644 --- a/chrome/browser/sessions/tab_restore_service.cc +++ b/chrome/browser/sessions/tab_restore_service.cc @@ -32,6 +32,7 @@ #include "content/public/browser/navigation_entry.h" using base::Time; +using content::NavigationEntry; // TimeFactory----------------------------------------------------------------- @@ -491,7 +492,7 @@ void TabRestoreService::PopulateTab(Tab* tab, entry_count++; tab->navigations.resize(static_cast<int>(entry_count)); for (int i = 0; i < entry_count; ++i) { - content::NavigationEntry* entry = (i == pending_index) ? + NavigationEntry* entry = (i == pending_index) ? controller->GetPendingEntry() : controller->GetEntryAtIndex(i); tab->navigations[i].SetFromNavigationEntry(*entry); } @@ -657,7 +658,7 @@ void TabRestoreService::ScheduleCommandsForTab(const Tab& tab, // Creating a NavigationEntry isn't the most efficient way to go about // this, but it simplifies the code and makes it less error prone as we // add new data to NavigationEntry. - scoped_ptr<content::NavigationEntry> entry( + scoped_ptr<NavigationEntry> entry( navigations[i].ToNavigationEntry(wrote_count, profile())); ScheduleCommand( CreateUpdateTabNavigationCommand(kCommandUpdateTabNavigation, tab.id, |