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

chrome/browser/geolocation/chrome_geolocation_permission_context.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/geolocation/chrome_geolocation_permission_context.h"
 
 #include <functional>
 #include <string>
 #include <vector>
 
@@ skipping 24 matching lines @@
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
 #include "grit/theme_resources_standard.h"
 #include "net/base/net_util.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 using WebKit::WebSecurityOrigin;
 using content::BrowserThread;
+using content::NavigationEntry;
 using content::OpenURLParams;
 using content::Referrer;
 using content::WebContents;
 
 // GeolocationInfoBarQueueController ------------------------------------------
 
 // This class controls the geolocation infobar queue per profile, and it's an
 // internal class to GeolocationPermissionContext.
 // An alternate approach would be to have this queue per tab, and use
 // notifications to broadcast when permission is set / listen to notification to
@@ skipping 116 matching lines @@
     int bridge_id,
     const GURL& requesting_frame_url,
     const std::string& display_languages)
     : ConfirmInfoBarDelegate(infobar_helper),
       controller_(controller),
       render_process_id_(render_process_id),
       render_view_id_(render_view_id),
       bridge_id_(bridge_id),
       requesting_frame_url_(requesting_frame_url),
       display_languages_(display_languages) {
-  const content::NavigationEntry* committed_entry =
+  const NavigationEntry* committed_entry =
       infobar_helper->web_contents()->GetController().GetLastCommittedEntry();
   committed_contents_unique_id_ = committed_entry ?
       committed_entry->GetUniqueID() : 0;
 }
 
 GeolocationConfirmInfoBarDelegate::~GeolocationConfirmInfoBarDelegate() {
   controller_->OnInfoBarClosed(render_process_id_, render_view_id_,
                                bridge_id_);
 }
 
@@ skipping 484 matching lines @@
         BrowserThread::UI, FROM_HERE,
         base::Bind(
             &ChromeGeolocationPermissionContext::CancelPendingInfoBarRequest,
             this, render_process_id, render_view_id, bridge_id));
      return;
   }
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   geolocation_infobar_queue_controller_->CancelInfoBarRequest(render_process_id,
       render_view_id, bridge_id);
 }