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

chrome/browser/sessions/session_types.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/session_types.h"
 
 #include "base/string_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "content/browser/tab_contents/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 
+using content::NavigationEntry;
+
 // TabNavigation --------------------------------------------------------------
 
 TabNavigation::TabNavigation()
     : transition_(content::PAGE_TRANSITION_TYPED),
       type_mask_(0),
       index_(-1) {
 }
 
 TabNavigation::TabNavigation(int index,
                              const GURL& virtual_url,
@@ skipping 28 matching lines @@
   referrer_ = tab.referrer_;
   title_ = tab.title_;
   state_ = tab.state_;
   transition_ = tab.transition_;
   type_mask_ = tab.type_mask_;
   index_ = tab.index_;
   return *this;
 }
 
 // static
-content::NavigationEntry* TabNavigation::ToNavigationEntry(
+NavigationEntry* TabNavigation::ToNavigationEntry(
     int page_id, Profile *profile) const {
-  content::NavigationEntry* entry = NavigationController::CreateNavigationEntry(
+  NavigationEntry* entry = NavigationController::CreateNavigationEntry(
       virtual_url_,
       referrer_,
       // Use a transition type of reload so that we don't incorrectly
       // increase the typed count.
       content::PAGE_TRANSITION_RELOAD,
       false,
       // The extra headers are not sync'ed across sessions.
       std::string(),
       profile);
 
   entry->SetPageID(page_id);
   entry->SetTitle(title_);
   entry->SetContentState(state_);
   entry->SetHasPostData(type_mask_ & TabNavigation::HAS_POST_DATA);
 
   return entry;
 }
 
-void TabNavigation::SetFromNavigationEntry(
-    const content::NavigationEntry& entry) {
+void TabNavigation::SetFromNavigationEntry(const NavigationEntry& entry) {
   virtual_url_ = entry.GetVirtualURL();
   referrer_ = entry.GetReferrer();
   title_ = entry.GetTitle();
   state_ = entry.GetContentState();
   transition_ = entry.GetTransitionType();
   type_mask_ = entry.GetHasPostData() ? TabNavigation::HAS_POST_DATA : 0;
 }
 
 // static
 void TabNavigation::CreateNavigationEntriesFromTabNavigations(
     Profile* profile,
     const std::vector<TabNavigation>& navigations,
-    std::vector<content::NavigationEntry*>* entries) {
+    std::vector<NavigationEntry*>* entries) {
   int page_id = 0;
   for (std::vector<TabNavigation>::const_iterator i =
            navigations.begin(); i != navigations.end(); ++i, ++page_id) {
     entries->push_back(i->ToNavigationEntry(page_id, profile));
   }
 }
 
 // SessionTab -----------------------------------------------------------------
 
 SessionTab::SessionTab()
@@ skipping 10 matching lines @@
 SessionWindow::SessionWindow()
     : selected_tab_index(-1),
       type(Browser::TYPE_TABBED),
       is_constrained(true),
       show_state(ui::SHOW_STATE_DEFAULT) {
 }
 
 SessionWindow::~SessionWindow() {
   STLDeleteElements(&tabs);
 }