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

chrome/browser/ui/blocked_content/blocked_content_tab_helper.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/blocked_content/blocked_content_tab_helper.h"
 
 #include "base/auto_reset.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/blocked_content/blocked_content_container.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 
+using content::NavigationEntry;
+
 BlockedContentTabHelper::BlockedContentTabHelper(
     TabContentsWrapper* tab_contents)
         : content::WebContentsObserver(tab_contents->web_contents()),
           blocked_contents_(new BlockedContentContainer(tab_contents)),
           all_contents_blocked_(false),
           tab_contents_wrapper_(tab_contents),
           delegate_(NULL) {
 }
 
 BlockedContentTabHelper::~BlockedContentTabHelper() {
@@ skipping 46 matching lines @@
 void BlockedContentTabHelper::AddPopup(TabContentsWrapper* new_contents,
                                        const gfx::Rect& initial_pos,
                                        bool user_gesture) {
   // A page can't spawn popups (or do anything else, either) until its load
   // commits, so when we reach here, the popup was spawned by the
   // NavigationController's last committed entry, not the active entry.  For
   // example, if a page opens a popup in an onunload() handler, then the active
   // entry is the page to be loaded as we navigate away from the unloading
   // page.  For this reason, we can't use GetURL() to get the opener URL,
   // because it returns the active entry.
-  content::NavigationEntry* entry =
+  NavigationEntry* entry =
       web_contents()->GetController().GetLastCommittedEntry();
   GURL creator = entry ? entry->GetVirtualURL() : GURL::EmptyGURL();
   Profile* profile =
       Profile::FromBrowserContext(web_contents()->GetBrowserContext());
 
   if (creator.is_valid() &&
       profile->GetHostContentSettingsMap()->GetContentSetting(
           creator,
           creator,
           CONTENT_SETTINGS_TYPE_POPUPS,
@@ skipping 22 matching lines @@
 }
 
 size_t BlockedContentTabHelper::GetBlockedContentsCount() const {
   return blocked_contents_->GetBlockedContentsCount();
 }
 
 void BlockedContentTabHelper::GetBlockedContents(
     std::vector<TabContentsWrapper*>* blocked_contents) const {
   blocked_contents_->GetBlockedContents(blocked_contents);
 }