Rename NavigationController to NavigationControllerImpl and put it into the content namespace. Al...

chrome/browser/sessions/tab_restore_service.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/sessions/tab_restore_service.h"
 
 #include <algorithm>
 #include <iterator>
 #include <map>
 
@@ skipping 14 matching lines @@
 #include "chrome/browser/sessions/tab_restore_service_observer.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/tab_contents/navigation_controller.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/public/browser/navigation_entry.h"
 
 using base::Time;
+using content::NavigationEntry;
 
 // TimeFactory-----------------------------------------------------------------
 
 TabRestoreService::TimeFactory::~TimeFactory() {}
 
 // Entry ----------------------------------------------------------------------
 
 // ID of the next Entry.
 static SessionID::id_type next_entry_id = 1;
 
@@ skipping 439 matching lines @@
 void TabRestoreService::PopulateTab(Tab* tab,
                                     int index,
                                     TabRestoreServiceDelegate* delegate,
                                     NavigationController* controller) {
   const int pending_index = controller->pending_entry_index();
   int entry_count = controller->entry_count();
   if (entry_count == 0 && pending_index == 0)
     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);
   }
   tab->timestamp = TimeNow();
   tab->current_navigation_index = controller->GetCurrentEntryIndex();
   if (tab->current_navigation_index == -1 && entry_count > 0)
     tab->current_navigation_index = 0;
   tab->tabstrip_index = index;
 
   TabContentsWrapper* wrapper =
@@ skipping 145 matching lines @@
                                           tab.extension_app_id));
   }
 
   // Then write the navigations.
   for (int i = first_index_to_persist, wrote_count = 0;
        i < max_index && wrote_count < 2 * max_persist_navigation_count; ++i) {
     if (ShouldTrackEntry(navigations[i].virtual_url())) {
       // 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,
                                            wrote_count++, *entry));
     }
   }
 }
 
 SessionCommand* TabRestoreService::CreateWindowCommand(SessionID::id_type id,
                                                        int selected_tab_index,
@@ skipping 493 matching lines @@
   // the front, not the end and we just added the entries to the end).
   entries_to_write_ = staging_entries_.size();
 
   PruneEntries();
   NotifyTabsChanged();
 }
 
 Time TabRestoreService::TimeNow() const {
   return time_factory_ ? time_factory_->TimeNow() : Time::Now();
 }