diff options
author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-21 05:09:04 +0000 |
---|---|---|
committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-21 05:09:04 +0000 |
commit | 69cda6547de3c2bc25e6476607e7550ba548cac9 (patch) | |
tree | e54f39838f04e0e61921cd7457711019be8b545f /chrome/browser/geolocation/geolocation_browsertest.cc | |
parent | c691a593ac199d774a43f239342cd85c80ca1a2a (diff) | |
download | chromium_src-69cda6547de3c2bc25e6476607e7550ba548cac9.zip chromium_src-69cda6547de3c2bc25e6476607e7550ba548cac9.tar.gz chromium_src-69cda6547de3c2bc25e6476607e7550ba548cac9.tar.bz2 |
Rename TabContents::controller() to GetController and put it into the WebContents namespace.
BUG=98716
TBR=dpranke
Review URL: http://codereview.chromium.org/8956050
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115276 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/geolocation/geolocation_browsertest.cc')
-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 712ce9b..3a41d99 100644 --- a/chrome/browser/geolocation/geolocation_browsertest.cc +++ b/chrome/browser/geolocation/geolocation_browsertest.cc @@ -46,7 +46,7 @@ class IFrameLoader : public content::NotificationObserver { : navigation_completed_(false), javascript_completed_(false) { NavigationController* controller = - &browser->GetSelectedTabContents()->controller(); + &browser->GetSelectedTabContents()->GetController(); registrar_.Add(this, content::NOTIFICATION_LOAD_STOP, content::Source<NavigationController>(controller)); registrar_.Add(this, chrome::NOTIFICATION_DOM_OPERATION_RESPONSE, @@ -324,7 +324,7 @@ class GeolocationBrowserTest : public InProcessBrowserTest { ui_test_utils::WindowedNotificationObserver observer( content::NOTIFICATION_LOAD_STOP, content::Source<NavigationController>( - &tab_contents_wrapper->tab_contents()->controller())); + &tab_contents_wrapper->tab_contents()->GetController())); if (allowed) infobar_->AsConfirmInfoBarDelegate()->Accept(); else @@ -507,7 +507,7 @@ IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, ui_test_utils::WindowedNotificationObserver observer( content::NOTIFICATION_LOAD_STOP, content::Source<NavigationController>( - ¤t_browser_->GetSelectedTabContents()->controller())); + ¤t_browser_->GetSelectedTabContents()->GetController())); NotifyGeoposition(fresh_position); observer.Wait(); CheckGeoposition(fresh_position); @@ -544,7 +544,7 @@ IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, ui_test_utils::WindowedNotificationObserver observer( content::NOTIFICATION_LOAD_STOP, content::Source<NavigationController>( - ¤t_browser_->GetSelectedTabContents()->controller())); + ¤t_browser_->GetSelectedTabContents()->GetController())); NotifyGeoposition(cached_position); observer.Wait(); CheckGeoposition(cached_position); @@ -652,7 +652,7 @@ IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, TwoWatchesInOneFrame) { ui_test_utils::WindowedNotificationObserver observer( content::NOTIFICATION_LOAD_STOP, content::Source<NavigationController>( - ¤t_browser_->GetSelectedTabContents()->controller())); + ¤t_browser_->GetSelectedTabContents()->GetController())); NotifyGeoposition(final_position); observer.Wait(); CheckGeoposition(final_position); |