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

chrome/browser/tabs/pinned_tab_codec.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/pinned_tab_codec.h"
 
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_tab_helper.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/pref_names.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/public/browser/navigation_entry.h"
 
+using content::NavigationEntry;
+
 typedef BrowserInit::LaunchWithProfile::Tab Tab;
 
 // Key used in dictionaries for the app id.
 static const char kAppID[] = "app_id";
 
 // Key used in dictionaries for the url.
 static const char kURL[] = "url";
 
 // Returns true if |browser| has any pinned tabs.
 static bool HasPinnedTabs(Browser* browser) {
@@ skipping 17 matching lines @@
     const Extension* extension =
         tab_contents->extension_tab_helper()->extension_app();
     DCHECK(extension);
     value->SetString(kAppID, extension->id());
     // For apps we use the launch url. We do this for the following reason:
     // . the user is effectively restarting the app, so that returning them to
     //   the app's launch page seems closest to what they expect.
     value->SetString(kURL, extension->GetFullLaunchURL().spec());
     values->Append(value.release());
   } else {
-    content::NavigationEntry* entry =
+    NavigationEntry* entry =
         tab_contents->tab_contents()->GetController().GetActiveEntry();
     if (!entry && tab_contents->tab_contents()->GetController().entry_count())
       entry = tab_contents->tab_contents()->GetController().GetEntryAtIndex(0);
     if (entry) {
       value->SetString(kURL, entry->GetURL().spec());
       values->Append(value.release());
     }
   }
 }
 
@@ skipping 58 matching lines @@
   for (size_t i = 0, max = pref_value->GetSize(); i < max; ++i) {
     DictionaryValue* values = NULL;
     if (pref_value->GetDictionary(i, &values)) {
       Tab tab;
       if (DecodeTab(*values, &tab))
         results.push_back(tab);
     }
   }
   return results;
 }