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

chrome/browser/tabs/tab_strip_model.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/tabs/tab_strip_model.h"
 
 #include <algorithm>
 #include <map>
 
 #include "base/command_line.h"
@@ skipping 16 matching lines @@
 #include "chrome/common/url_constants.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/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents_delegate.h"
 
+using content::NavigationEntry;
 using content::UserMetricsAction;
 using content::WebContents;
 
 namespace {
 
 // Returns true if the specified transition is one of the types that cause the
 // opener relationships for the tab in which the transition occured to be
 // forgotten. This is generally any navigation that isn't a link click (i.e.
 // any navigation that can be considered to be the start of a new task distinct
 // from what had previously occurred in that tab).
@@ skipping 162 matching lines @@
 TabContentsWrapper* TabStripModel::DiscardTabContentsAt(int index) {
   DCHECK(ContainsIndex(index));
   TabContentsWrapper* null_contents =
       new TabContentsWrapper(
           new TabContents(profile(),
                           NULL /* site_instance */,
                           MSG_ROUTING_NONE,
                           NULL /* base_tab_contents */,
                           NULL /* session_storage_namespace */));
   TabContentsWrapper* old_contents = GetContentsAt(index);
-  content::NavigationEntry* old_nav_entry =
+  NavigationEntry* old_nav_entry =
       old_contents->tab_contents()->GetController().GetActiveEntry();
   if (old_nav_entry) {
     // Set the new tab contents to reload this URL when clicked.
     // This also allows the tab to keep drawing the favicon and page title.
-    content::NavigationEntry* new_nav_entry =
-        content::NavigationEntry::Create(*old_nav_entry);
-    std::vector<content::NavigationEntry*> entries;
+    NavigationEntry* new_nav_entry = NavigationEntry::Create(*old_nav_entry);
+    std::vector<NavigationEntry*> entries;
     entries.push_back(new_nav_entry);
     null_contents->tab_contents()->GetController().Restore(0, false, &entries);
   }
   ReplaceTabContentsAt(index, null_contents);
   // Mark the tab so it will reload when we click.
   contents_data_[index]->discarded = true;
   delete old_contents;
   return null_contents;
 }
 
@@ skipping 1089 matching lines @@
 void TabStripModel::ForgetOpenersAndGroupsReferencing(
     const NavigationController* tab) {
   for (TabContentsDataVector::const_iterator i = contents_data_.begin();
        i != contents_data_.end(); ++i) {
     if ((*i)->group == tab)
       (*i)->group = NULL;
     if ((*i)->opener == tab)
       (*i)->opener = NULL;
   }
 }