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

chrome/browser/debugger/devtools_window.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 <algorithm>
 
 #include "base/command_line.h"
 #include "base/json/json_writer.h"
 #include "base/lazy_instance.h"
 #include "base/string_number_conversions.h"
@@ skipping 40 matching lines @@
 namespace {
 base::LazyInstance<DevToolsWindowList,
                    base::LeakyLazyInstanceTraits<DevToolsWindowList> >
      g_instances = LAZY_INSTANCE_INITIALIZER;
 }  // namespace
 
 using content::DevToolsAgentHost;
 using content::DevToolsAgentHostRegistry;
 using content::DevToolsClientHost;
 using content::DevToolsManager;
+using content::NavigationEntry;
 using content::OpenURLParams;
 using content::WebContents;
 
 const char DevToolsWindow::kDevToolsApp[] = "DevToolsApp";
 
 // static
 void DevToolsWindow::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterBooleanPref(prefs::kDevToolsOpenDocked,
                              true,
                              PrefService::UNSYNCABLE_PREF);
@@ skipping 112 matching lines @@
       browser_(NULL),
       docked_(docked),
       is_loaded_(false),
       action_on_load_(DEVTOOLS_TOGGLE_ACTION_NONE),
       frontend_host_(NULL) {
   frontend_host_ = DevToolsClientHost::CreateDevToolsFrontendHost(
       tab_contents->tab_contents(),
       this);
   g_instances.Get().push_back(this);
   // Wipe out page icon so that the default application icon is used.
-  content::NavigationEntry* entry =
+  NavigationEntry* entry =
       tab_contents_->tab_contents()->GetController().GetActiveEntry();
   entry->GetFavicon().bitmap = SkBitmap();
   entry->GetFavicon().valid = true;
 
   // Register on-load actions.
   registrar_.Add(
       this,
       content::NOTIFICATION_LOAD_STOP,
       content::Source<NavigationController>(
           &tab_contents_->tab_contents()->GetController()));
@@ skipping 489 matching lines @@
                            content);
 }
 
 content::JavaScriptDialogCreator* DevToolsWindow::GetJavaScriptDialogCreator() {
   if (inspected_tab_ && inspected_tab_->tab_contents()->GetDelegate()) {
     return inspected_tab_->tab_contents()->GetDelegate()->
         GetJavaScriptDialogCreator();
   }
   return content::WebContentsDelegate::GetJavaScriptDialogCreator();
 }