diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-03 18:27:46 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-03 18:27:46 +0000 |
| commit | cca0f1e9ca8aa46a9088028ceb1f08e0a3f792b2 (patch) | |
| tree | 84e486002d42744cea34f59d1b83ab29a0dc5354 /chrome/browser/geolocation | |
| parent | 2a3197bb6a8a4c6f3a7affadce28cda638906131 (diff) | |
| download | chromium_src-cca0f1e9ca8aa46a9088028ceb1f08e0a3f792b2.zip chromium_src-cca0f1e9ca8aa46a9088028ceb1f08e0a3f792b2.tar.gz chromium_src-cca0f1e9ca8aa46a9088028ceb1f08e0a3f792b2.tar.bz2 | |
Convert all the notifications which use NavigationController to content::NavigationController. After this is done, we can then make WebContents return a content::NavigationEntry instead of the impl.
BUG=98716
TBR=joi
Review URL: http://codereview.chromium.org/9016047
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116150 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/geolocation')
| -rw-r--r-- | chrome/browser/geolocation/geolocation_browsertest.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/geolocation/geolocation_browsertest.cc b/chrome/browser/geolocation/geolocation_browsertest.cc index 1202c92..d756eb4 100644 --- a/chrome/browser/geolocation/geolocation_browsertest.cc +++ b/chrome/browser/geolocation/geolocation_browsertest.cc @@ -50,7 +50,7 @@ class IFrameLoader : public content::NotificationObserver { NavigationController* controller = &browser->GetSelectedWebContents()->GetController(); registrar_.Add(this, content::NOTIFICATION_LOAD_STOP, - content::Source<NavigationController>(controller)); + content::Source<content::NavigationController>(controller)); registrar_.Add(this, chrome::NOTIFICATION_DOM_OPERATION_RESPONSE, content::NotificationService::AllSources()); std::string script = base::StringPrintf( @@ -325,7 +325,7 @@ class GeolocationBrowserTest : public InProcessBrowserTest { { ui_test_utils::WindowedNotificationObserver observer( content::NOTIFICATION_LOAD_STOP, - content::Source<NavigationController>( + content::Source<content::NavigationController>( &tab_contents_wrapper->web_contents()->GetController())); if (allowed) infobar_->AsConfirmInfoBarDelegate()->Accept(); @@ -508,7 +508,7 @@ IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, Geoposition fresh_position = GeopositionFromLatLong(3.17, 4.23); ui_test_utils::WindowedNotificationObserver observer( content::NOTIFICATION_LOAD_STOP, - content::Source<NavigationController>( + content::Source<content::NavigationController>( ¤t_browser_->GetSelectedWebContents()->GetController())); NotifyGeoposition(fresh_position); observer.Wait(); @@ -545,7 +545,7 @@ IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, Geoposition cached_position = GeopositionFromLatLong(5.67, 8.09); ui_test_utils::WindowedNotificationObserver observer( content::NOTIFICATION_LOAD_STOP, - content::Source<NavigationController>( + content::Source<content::NavigationController>( ¤t_browser_->GetSelectedWebContents()->GetController())); NotifyGeoposition(cached_position); observer.Wait(); @@ -653,7 +653,7 @@ IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, TwoWatchesInOneFrame) { // its way through to the first watcher. ui_test_utils::WindowedNotificationObserver observer( content::NOTIFICATION_LOAD_STOP, - content::Source<NavigationController>( + content::Source<content::NavigationController>( ¤t_browser_->GetSelectedWebContents()->GetController())); NotifyGeoposition(final_position); observer.Wait(); |