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

chrome/browser/extensions/extension_tab_util.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/profiles/profile.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/sessions/restore_tab_helper.h"
 #include "chrome/browser/extensions/extension_tabs_module_constants.h"
 #include "content/public/browser/favicon_status.h"
 #include "content/public/browser/navigation_entry.h"
 
 namespace keys = extension_tabs_module_constants;
 namespace errors = extension_manifest_errors;
 
+using content::NavigationEntry;
 using content::WebContents;
 
 int ExtensionTabUtil::GetWindowId(const Browser* browser) {
   return browser->session_id().id();
 }
 
 int ExtensionTabUtil::GetWindowIdOfTabStripModel(
     const TabStripModel* tab_strip_model) {
   for (BrowserList::const_iterator it = BrowserList::begin();
        it != BrowserList::end(); ++it) {
@@ skipping 81 matching lines @@
                      tab_strip && tab_index == tab_strip->active_index());
   result->SetBoolean(keys::kHighlightedKey,
                    tab_strip && tab_strip->IsTabSelected(tab_index));
   result->SetBoolean(keys::kPinnedKey,
                      tab_strip && tab_strip->IsTabPinned(tab_index));
   result->SetString(keys::kTitleKey, contents->GetTitle());
   result->SetBoolean(keys::kIncognitoKey,
                      contents->GetBrowserContext()->IsOffTheRecord());
 
   if (!is_loading) {
-    content::NavigationEntry* entry =
-        contents->GetController().GetActiveEntry();
+    NavigationEntry* entry = contents->GetController().GetActiveEntry();
     if (entry) {
       if (entry->GetFavicon().valid)
         result->SetString(keys::kFaviconUrlKey, entry->GetFavicon().url.spec());
     }
   }
 
   return result;
 }
 
 DictionaryValue* ExtensionTabUtil::CreateTabValueActive(
@@ skipping 101 matching lines @@
             *contents = target_contents;
           if (tab_index)
             *tab_index = i;
           return true;
         }
       }
     }
   }
   return false;
 }