| Index: third_party/WebKit/Source/modules/geolocation/Geolocation.cpp
|
| diff --git a/third_party/WebKit/Source/modules/geolocation/Geolocation.cpp b/third_party/WebKit/Source/modules/geolocation/Geolocation.cpp
|
| index 921da19d3f5694976eb85e2cd0396867a73da641..98272a4aca47422ca6e5957f03a45e2ba4f0be02 100644
|
| --- a/third_party/WebKit/Source/modules/geolocation/Geolocation.cpp
|
| +++ b/third_party/WebKit/Source/modules/geolocation/Geolocation.cpp
|
| @@ -137,7 +137,7 @@ void Geolocation::recordOriginTypeAccess() const {
|
| UseCounter::count(document, UseCounter::GeolocationSecureOrigin);
|
| UseCounter::countCrossOriginIframe(
|
| *document, UseCounter::GeolocationSecureOriginIframe);
|
| - } else if (frame()->settings()->allowGeolocationOnInsecureOrigins()) {
|
| + } else if (frame()->settings()->getAllowGeolocationOnInsecureOrigins()) {
|
| // TODO(jww): This should be removed after WebView is fixed so that it
|
| // disallows geolocation in insecure contexts.
|
| //
|
| @@ -194,7 +194,7 @@ int Geolocation::watchPosition(PositionCallback* successCallback,
|
| void Geolocation::startRequest(GeoNotifier* notifier) {
|
| recordOriginTypeAccess();
|
| String errorMessage;
|
| - if (!frame()->settings()->allowGeolocationOnInsecureOrigins() &&
|
| + if (!frame()->settings()->getAllowGeolocationOnInsecureOrigins() &&
|
| !getExecutionContext()->isSecureContext(errorMessage)) {
|
| notifier->setFatalError(
|
| PositionError::create(PositionError::kPermissionDenied, errorMessage));
|
|
|