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

chrome/browser/ui/sync/tab_contents_wrapper_synced_tab_delegate.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/ui/sync/tab_contents_wrapper_synced_tab_delegate.h"
 
 #include "content/browser/tab_contents/navigation_controller.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/extensions/extension_tab_helper.h"
 #include "chrome/browser/sessions/restore_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/extensions/extension.h"
 #include "content/public/browser/navigation_entry.h"
 
+using content::NavigationEntry;
+
 TabContentsWrapperSyncedTabDelegate::TabContentsWrapperSyncedTabDelegate(
     TabContentsWrapper* tab_contents_wrapper)
         : tab_contents_wrapper_(tab_contents_wrapper) {}
 
 TabContentsWrapperSyncedTabDelegate::~TabContentsWrapperSyncedTabDelegate() {}
 
 SessionID::id_type TabContentsWrapperSyncedTabDelegate::GetWindowId() const {
   return tab_contents_wrapper_->restore_tab_helper()->window_id().id();
 }
 
@@ skipping 27 matching lines @@
 
 int TabContentsWrapperSyncedTabDelegate::GetEntryCount() const {
   return tab_contents_wrapper_->tab_contents()->GetController().entry_count();
 }
 
 int TabContentsWrapperSyncedTabDelegate::GetPendingEntryIndex() const {
   return tab_contents_wrapper_->tab_contents()->GetController().
       pending_entry_index();
 }
 
-content::NavigationEntry*
-    TabContentsWrapperSyncedTabDelegate::GetPendingEntry() const {
+NavigationEntry* TabContentsWrapperSyncedTabDelegate::GetPendingEntry() const {
   return
       tab_contents_wrapper_->tab_contents()->GetController().GetPendingEntry();
 }
 
-content::NavigationEntry*
-    TabContentsWrapperSyncedTabDelegate::GetEntryAtIndex(int i)
+NavigationEntry* TabContentsWrapperSyncedTabDelegate::GetEntryAtIndex(int i)
     const {
   return
       tab_contents_wrapper_->tab_contents()->GetController().GetEntryAtIndex(i);
 }
 
-content::NavigationEntry*
-    TabContentsWrapperSyncedTabDelegate::GetActiveEntry() const {
+NavigationEntry* TabContentsWrapperSyncedTabDelegate::GetActiveEntry() const {
   return
       tab_contents_wrapper_->tab_contents()->GetController().GetActiveEntry();
 }