diff options
Diffstat (limited to 'chrome/browser/geolocation')
-rw-r--r-- | chrome/browser/geolocation/chrome_geolocation_permission_context.cc | 3 | ||||
-rw-r--r-- | chrome/browser/geolocation/geolocation_settings_state_unittest.cc | 7 |
2 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/geolocation/chrome_geolocation_permission_context.cc b/chrome/browser/geolocation/chrome_geolocation_permission_context.cc index dfdfae0..b1f57f3 100644 --- a/chrome/browser/geolocation/chrome_geolocation_permission_context.cc +++ b/chrome/browser/geolocation/chrome_geolocation_permission_context.cc @@ -42,6 +42,7 @@ using WebKit::WebSecurityOrigin; using content::BrowserThread; +using content::NavigationEntry; using content::OpenURLParams; using content::Referrer; using content::WebContents; @@ -178,7 +179,7 @@ GeolocationConfirmInfoBarDelegate::GeolocationConfirmInfoBarDelegate( 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; diff --git a/chrome/browser/geolocation/geolocation_settings_state_unittest.cc b/chrome/browser/geolocation/geolocation_settings_state_unittest.cc index db41369..9cd8ee1 100644 --- a/chrome/browser/geolocation/geolocation_settings_state_unittest.cc +++ b/chrome/browser/geolocation/geolocation_settings_state_unittest.cc @@ -14,6 +14,7 @@ #include "testing/gtest/include/gtest/gtest.h" using content::BrowserThread; +using content::NavigationEntry; namespace { @@ -33,8 +34,7 @@ TEST_F(GeolocationSettingsStateTests, ClearOnNewOrigin) { GeolocationSettingsState state(&profile); GURL url_0("http://www.example.com"); - scoped_ptr<content::NavigationEntry> entry( - content::NavigationEntry::Create()); + scoped_ptr<NavigationEntry> entry(NavigationEntry::Create()); entry->SetURL(url_0); content::LoadCommittedDetails load_committed_details; load_committed_details.entry = entry.get(); @@ -139,8 +139,7 @@ TEST_F(GeolocationSettingsStateTests, ShowPortOnSameHost) { GeolocationSettingsState state(&profile); GURL url_0("http://www.example.com"); - scoped_ptr<content::NavigationEntry> entry( - content::NavigationEntry::Create()); + scoped_ptr<NavigationEntry> entry(NavigationEntry::Create()); entry->SetURL(url_0); content::LoadCommittedDetails load_committed_details; load_committed_details.entry = entry.get(); |