chrome/android/java/src/org/chromium/chrome/browser/preferences/website/Website.java - Issue 2612993002: Make geolocation API and X-Geo header access consistent

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/preferences/website/Website.java

Issue 2612993002: Make geolocation API and X-Geo header access consistent (Closed)

Patch Set: Fix test / merge error Created 3 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleWebsitePreferences.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePreferenceBridge.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/website/Website.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/Website.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/Website.java

index 1d7ad795cce15f3ceaf164b492cb19ccc00cf2bb..3e18aeacdf3677cf1203f09f3cd5950ea90114b2 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/Website.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/Website.java

@@ -206,8 +206,13 @@ public class Website implements Serializable {

* Configure geolocation access setting for this site.

public void setGeolocationPermission(ContentSetting value) {

- if (mGeolocationInfo != null) {

- mGeolocationInfo.setContentSetting(value);

+ if (WebsitePreferenceBridge.shouldUseDSEGeolocationSetting(

+ mOrigin.getOrigin(), false)) {

+ WebsitePreferenceBridge.setDSEGeolocationSetting(value != ContentSetting.BLOCK);

+ } else {

+ if (mGeolocationInfo != null) {

+ mGeolocationInfo.setContentSetting(value);

+ }

}