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

chrome/browser/extensions/extension_navigation_observer.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/extensions/extension_navigation_observer.h"
 
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/browser/tab_contents/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 
+using content::NavigationEntry;
+
 ExtensionNavigationObserver::ExtensionNavigationObserver(Profile* profile)
     : profile_(profile) {
   RegisterForNotifications();
 }
 
 ExtensionNavigationObserver::~ExtensionNavigationObserver() {}
 
 void ExtensionNavigationObserver::Observe(
     int type,
     const content::NotificationSource& source,
@@ skipping 16 matching lines @@
   registrar_.Add(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
                  content::NotificationService::AllSources());
 }
 
 void ExtensionNavigationObserver::PromptToEnableExtensionIfNecessary(
     NavigationController* nav_controller) {
   // Bail out if we're already running a prompt.
   if (!in_progress_prompt_extension_id_.empty())
     return;
 
-  content::NavigationEntry* nav_entry = nav_controller->GetActiveEntry();
+  NavigationEntry* nav_entry = nav_controller->GetActiveEntry();
   if (!nav_entry)
     return;
 
   ExtensionService* extension_service = profile_->GetExtensionService();
   const Extension* extension =
       extension_service->disabled_extensions()->
       GetExtensionOrAppByURL(ExtensionURLInfo(nav_entry->GetURL()));
   if (!extension)
     return;
 
@@ skipping 40 matching lines @@
   in_progress_prompt_extension_id_ = "";
   in_progress_prompt_navigation_controller_ = NULL;
   extension_install_ui_.reset();
 
   std::string histogram_name = user_initiated ?
       "Extensions.Permissions_ReEnableCancel" :
       "Extensions.Permissions_ReEnableAbort";
   ExtensionService::RecordPermissionMessagesHistogram(
       extension, histogram_name.c_str());
 }