Skip to content

GitLab

T
tangled
Commit 72df1c59 authored by Natalie Chouinard's avatar Natalie Chouinard Committed by Commit Bot
Browse files
Options

Remove unused parameter from PrefServiceBridgeJni 

The PrefServiceBridge Java caller object is not used on the native side
remove it from all calls.

Bug: 1016957
Change-Id: I3987dd419723fd9a11f00c93fa45a8e738574a88
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1894268Reviewed-by: default avatarPatrick Noland <pnoland@chromium.org>
Commit-Queue: Natalie Chouinard <chouinard@chromium.org>
Cr-Commit-Position: refs/heads/master@{#711817}
parent 80098b78
Hide whitespace changes
Inline Side-by-side
Showing with 236 additions and 372 deletions
chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java
View file @ 72df1c59
......@@ -108,7 +108,7 @@ public class PrefServiceBridge {
* @return Whether the specified preference is enabled.
*/
public boolean getBoolean(@Pref int preference) {
return PrefServiceBridgeJni.get().getBoolean(PrefServiceBridge.this, preference);
return PrefServiceBridgeJni.get().getBoolean(preference);
}
/**
......@@ -116,7 +116,7 @@ public class PrefServiceBridge {
* @param value The value the specified preference will be set to.
*/
public void setBoolean(@Pref int preference, boolean value) {
PrefServiceBridgeJni.get().setBoolean(PrefServiceBridge.this, preference, value);
PrefServiceBridgeJni.get().setBoolean(preference, value);
}
/**
......@@ -124,7 +124,7 @@ public class PrefServiceBridge {
* @return value The value of the specified preference.
*/
public int getInteger(@Pref int preference) {
return PrefServiceBridgeJni.get().getInteger(PrefServiceBridge.this, preference);
return PrefServiceBridgeJni.get().getInteger(preference);
}
/**
......@@ -132,7 +132,7 @@ public class PrefServiceBridge {
* @param value The value the specified preference will be set to.
*/
public void setInteger(@Pref int preference, int value) {
PrefServiceBridgeJni.get().setInteger(PrefServiceBridge.this, preference, value);
PrefServiceBridgeJni.get().setInteger(preference, value);
}
/**
......@@ -141,7 +141,7 @@ public class PrefServiceBridge {
*/
@NonNull
public String getString(@Pref int preference) {
return PrefServiceBridgeJni.get().getString(PrefServiceBridge.this, preference);
return PrefServiceBridgeJni.get().getString(preference);
}
/**
......@@ -149,7 +149,7 @@ public class PrefServiceBridge {
* @param value The value the specified preference will be set to.
*/
public void setString(@Pref int preference, @NonNull String value) {
PrefServiceBridgeJni.get().setString(PrefServiceBridge.this, preference, value);
PrefServiceBridgeJni.get().setString(preference, value);
}
/**
......@@ -157,7 +157,7 @@ public class PrefServiceBridge {
* @return Whether the specified preference is managed.
*/
public boolean isManagedPreference(@Pref int preference) {
return PrefServiceBridgeJni.get().isManagedPreference(PrefServiceBridge.this, preference);
return PrefServiceBridgeJni.get().isManagedPreference(preference);
}
/**
......@@ -174,7 +174,7 @@ public class PrefServiceBridge {
}
if (currentVersion < 1) {
PrefServiceBridgeJni.get().migrateJavascriptPreference(PrefServiceBridge.this);
PrefServiceBridgeJni.get().migrateJavascriptPreference();
}
// Steps 2,3,4 intentionally skipped.
preferences.edit().putInt(MIGRATION_PREF_KEY, MIGRATION_CURRENT_VERSION).apply();
......@@ -185,8 +185,7 @@ public class PrefServiceBridge {
* @param contentSettingsType The content setting type to check.
*/
public boolean isContentSettingEnabled(int contentSettingsType) {
return PrefServiceBridgeJni.get().isContentSettingEnabled(
PrefServiceBridge.this, contentSettingsType);
return PrefServiceBridgeJni.get().isContentSettingEnabled(contentSettingsType);
}
/**
......@@ -194,8 +193,7 @@ public class PrefServiceBridge {
* @param contentSettingsType The content setting type to check.
*/
public boolean isContentSettingManaged(int contentSettingsType) {
return PrefServiceBridgeJni.get().isContentSettingManaged(
PrefServiceBridge.this, contentSettingsType);
return PrefServiceBridgeJni.get().isContentSettingManaged(contentSettingsType);
}
/**
......@@ -204,8 +202,7 @@ public class PrefServiceBridge {
* @param enabled Whether the default value should be disabled or enabled.
*/
public void setContentSettingEnabled(int contentSettingsType, boolean enabled) {
PrefServiceBridgeJni.get().setContentSettingEnabled(
PrefServiceBridge.this, contentSettingsType, enabled);
PrefServiceBridgeJni.get().setContentSettingEnabled(contentSettingsType, enabled);
}
/**
......@@ -214,8 +211,7 @@ public class PrefServiceBridge {
*/
public List<ContentSettingException> getContentSettingsExceptions(int contentSettingsType) {
List<ContentSettingException> list = new ArrayList<ContentSettingException>();
PrefServiceBridgeJni.get().getContentSettingsExceptions(
PrefServiceBridge.this, contentSettingsType, list);
PrefServiceBridgeJni.get().getContentSettingsExceptions(contentSettingsType, list);
return list;
}
......@@ -263,7 +259,7 @@ public class PrefServiceBridge {
* @return Whether cookies acceptance is modifiable by the user
*/
public boolean isAcceptCookiesUserModifiable() {
return PrefServiceBridgeJni.get().getAcceptCookiesUserModifiable(PrefServiceBridge.this);
return PrefServiceBridgeJni.get().getAcceptCookiesUserModifiable();
}
/**
......@@ -271,8 +267,7 @@ public class PrefServiceBridge {
* (for supervised users).
*/
public boolean isAcceptCookiesManagedByCustodian() {
return PrefServiceBridgeJni.get().getAcceptCookiesManagedByCustodian(
PrefServiceBridge.this);
return PrefServiceBridgeJni.get().getAcceptCookiesManagedByCustodian();
}
// TODO(crbug.com/1016957): Inline downstream.
......@@ -284,28 +279,28 @@ public class PrefServiceBridge {
* @return Whether vibration is enabled for notifications.
*/
public boolean isNotificationsVibrateEnabled() {
return PrefServiceBridgeJni.get().getNotificationsVibrateEnabled(PrefServiceBridge.this);
return PrefServiceBridgeJni.get().getNotificationsVibrateEnabled();
}
/**
* @return Whether geolocation information can be shared with content.
*/
public boolean isAllowLocationEnabled() {
return PrefServiceBridgeJni.get().getAllowLocationEnabled(PrefServiceBridge.this);
return PrefServiceBridgeJni.get().getAllowLocationEnabled();
}
/**
* @return Whether geolocation information access is set to be shared with all sites, by policy.
*/
public boolean isLocationAllowedByPolicy() {
return PrefServiceBridgeJni.get().getLocationAllowedByPolicy(PrefServiceBridge.this);
return PrefServiceBridgeJni.get().getLocationAllowedByPolicy();
}
/**
* @return Whether the location preference is modifiable by the user.
*/
public boolean isAllowLocationUserModifiable() {
return PrefServiceBridgeJni.get().getAllowLocationUserModifiable(PrefServiceBridge.this);
return PrefServiceBridgeJni.get().getAllowLocationUserModifiable();
}
/**
......@@ -313,19 +308,18 @@ public class PrefServiceBridge {
* being managed by the custodian of the supervised account.
*/
public boolean isAllowLocationManagedByCustodian() {
return PrefServiceBridgeJni.get().getAllowLocationManagedByCustodian(
PrefServiceBridge.this);
return PrefServiceBridgeJni.get().getAllowLocationManagedByCustodian();
}
public boolean getPasswordEchoEnabled() {
return PrefServiceBridgeJni.get().getPasswordEchoEnabled(PrefServiceBridge.this);
return PrefServiceBridgeJni.get().getPasswordEchoEnabled();
}
/**
* @return Whether EULA has been accepted by the user.
*/
public boolean isFirstRunEulaAccepted() {
return PrefServiceBridgeJni.get().getFirstRunEulaAccepted(PrefServiceBridge.this);
return PrefServiceBridgeJni.get().getFirstRunEulaAccepted();
}
/**
......@@ -353,66 +347,63 @@ public class PrefServiceBridge {
* Sets the preference that controls translate
*/
public void setTranslateEnabled(boolean enabled) {
PrefServiceBridgeJni.get().setTranslateEnabled(PrefServiceBridge.this, enabled);
PrefServiceBridgeJni.get().setTranslateEnabled(enabled);
}
/**
* Sets the preference that signals when the user has accepted the EULA.
*/
public void setEulaAccepted() {
PrefServiceBridgeJni.get().setEulaAccepted(PrefServiceBridge.this);
PrefServiceBridgeJni.get().setEulaAccepted();
}
/**
* @return the last account username associated with sync.
*/
public String getSyncLastAccountName() {
return PrefServiceBridgeJni.get().getSyncLastAccountName(PrefServiceBridge.this);
return PrefServiceBridgeJni.get().getSyncLastAccountName();
}
/**
* @return Whether Safe Browsing Extended Reporting is currently enabled.
*/
public boolean isSafeBrowsingExtendedReportingEnabled() {
return PrefServiceBridgeJni.get().getSafeBrowsingExtendedReportingEnabled(
PrefServiceBridge.this);
return PrefServiceBridgeJni.get().getSafeBrowsingExtendedReportingEnabled();
}
/**
* @param enabled Whether Safe Browsing Extended Reporting should be enabled.
*/
public void setSafeBrowsingExtendedReportingEnabled(boolean enabled) {
PrefServiceBridgeJni.get().setSafeBrowsingExtendedReportingEnabled(
PrefServiceBridge.this, enabled);
PrefServiceBridgeJni.get().setSafeBrowsingExtendedReportingEnabled(enabled);
}
/**
* @return Whether Safe Browsing Extended Reporting is managed
*/
public boolean isSafeBrowsingExtendedReportingManaged() {
return PrefServiceBridgeJni.get().getSafeBrowsingExtendedReportingManaged(
PrefServiceBridge.this);
return PrefServiceBridgeJni.get().getSafeBrowsingExtendedReportingManaged();
}
/**
* @return Whether Safe Browsing is currently enabled.
*/
public boolean isSafeBrowsingEnabled() {
return PrefServiceBridgeJni.get().getSafeBrowsingEnabled(PrefServiceBridge.this);
return PrefServiceBridgeJni.get().getSafeBrowsingEnabled();
}
/**
* @param enabled Whether Safe Browsing should be enabled.
*/
public void setSafeBrowsingEnabled(boolean enabled) {
PrefServiceBridgeJni.get().setSafeBrowsingEnabled(PrefServiceBridge.this, enabled);
PrefServiceBridgeJni.get().setSafeBrowsingEnabled(enabled);
}
/**
* @return Whether Safe Browsing is managed
*/
public boolean isSafeBrowsingManaged() {
return PrefServiceBridgeJni.get().getSafeBrowsingManaged(PrefServiceBridge.this);
return PrefServiceBridgeJni.get().getSafeBrowsingManaged();
}
/**
......@@ -420,29 +411,28 @@ public class PrefServiceBridge {
* used for preference migration. See http://crbug.com/334602
*/
public boolean obsoleteNetworkPredictionOptionsHasUserSetting() {
return PrefServiceBridgeJni.get().obsoleteNetworkPredictionOptionsHasUserSetting(
PrefServiceBridge.this);
return PrefServiceBridgeJni.get().obsoleteNetworkPredictionOptionsHasUserSetting();
}
/**
* @return Network predictions preference.
*/
public boolean getNetworkPredictionEnabled() {
return PrefServiceBridgeJni.get().getNetworkPredictionEnabled(PrefServiceBridge.this);
return PrefServiceBridgeJni.get().getNetworkPredictionEnabled();
}
/**
* Sets network predictions preference.
*/
public void setNetworkPredictionEnabled(boolean enabled) {
PrefServiceBridgeJni.get().setNetworkPredictionEnabled(PrefServiceBridge.this, enabled);
PrefServiceBridgeJni.get().setNetworkPredictionEnabled(enabled);
}
/**
* @return Whether Network Predictions is configured by policy.
*/
public boolean isNetworkPredictionManaged() {
return PrefServiceBridgeJni.get().getNetworkPredictionManaged(PrefServiceBridge.this);
return PrefServiceBridgeJni.get().getNetworkPredictionManaged();
}
/**
......@@ -451,43 +441,42 @@ public class PrefServiceBridge {
* @return Whether network predictions are allowed.
*/
public boolean canPrefetchAndPrerender() {
return PrefServiceBridgeJni.get().canPrefetchAndPrerender(PrefServiceBridge.this);
return PrefServiceBridgeJni.get().canPrefetchAndPrerender();
}
/**
* @return Whether the web service to resolve navigation error is enabled.
*/
public boolean isResolveNavigationErrorEnabled() {
return PrefServiceBridgeJni.get().getResolveNavigationErrorEnabled(PrefServiceBridge.this);
return PrefServiceBridgeJni.get().getResolveNavigationErrorEnabled();
}
/**
* @return Whether the web service to resolve navigation error is configured by policy.
*/
public boolean isResolveNavigationErrorManaged() {
return PrefServiceBridgeJni.get().getResolveNavigationErrorManaged(PrefServiceBridge.this);
return PrefServiceBridgeJni.get().getResolveNavigationErrorManaged();
}
/**
* @return true if translate is enabled, false otherwise.
*/
public boolean isTranslateEnabled() {
return PrefServiceBridgeJni.get().getTranslateEnabled(PrefServiceBridge.this);
return PrefServiceBridgeJni.get().getTranslateEnabled();
}
/**
* @return Whether translate is configured by policy
*/
public boolean isTranslateManaged() {
return PrefServiceBridgeJni.get().getTranslateManaged(PrefServiceBridge.this);
return PrefServiceBridgeJni.get().getTranslateManaged();
}
/**
* Sets whether the web service to resolve navigation error should be enabled.
*/
public void setResolveNavigationErrorEnabled(boolean enabled) {
PrefServiceBridgeJni.get().setResolveNavigationErrorEnabled(
PrefServiceBridge.this, enabled);
PrefServiceBridgeJni.get().setResolveNavigationErrorEnabled(enabled);
}
// TODO(crbug.com/1016957): Inline downstream.
......@@ -496,11 +485,11 @@ public class PrefServiceBridge {
}
public void setNotificationsVibrateEnabled(boolean enabled) {
PrefServiceBridgeJni.get().setNotificationsVibrateEnabled(PrefServiceBridge.this, enabled);
PrefServiceBridgeJni.get().setNotificationsVibrateEnabled(enabled);
}
public void setPasswordEchoEnabled(boolean enabled) {
PrefServiceBridgeJni.get().setPasswordEchoEnabled(PrefServiceBridge.this, enabled);
PrefServiceBridgeJni.get().setPasswordEchoEnabled(enabled);
}
/**
......@@ -537,38 +526,37 @@ public class PrefServiceBridge {
setContentSettingEnabled(contentSettingsType, allow);
break;
case ContentSettingsType.AUTOMATIC_DOWNLOADS:
PrefServiceBridgeJni.get().setAutomaticDownloadsEnabled(
PrefServiceBridge.this, allow);
PrefServiceBridgeJni.get().setAutomaticDownloadsEnabled(allow);
break;
case ContentSettingsType.AUTOPLAY:
PrefServiceBridgeJni.get().setAutoplayEnabled(PrefServiceBridge.this, allow);
PrefServiceBridgeJni.get().setAutoplayEnabled(allow);
break;
case ContentSettingsType.BACKGROUND_SYNC:
PrefServiceBridgeJni.get().setBackgroundSyncEnabled(PrefServiceBridge.this, allow);
PrefServiceBridgeJni.get().setBackgroundSyncEnabled(allow);
break;
case ContentSettingsType.CLIPBOARD_READ:
PrefServiceBridgeJni.get().setClipboardEnabled(PrefServiceBridge.this, allow);
PrefServiceBridgeJni.get().setClipboardEnabled(allow);
break;
case ContentSettingsType.COOKIES:
PrefServiceBridgeJni.get().setAllowCookiesEnabled(PrefServiceBridge.this, allow);
PrefServiceBridgeJni.get().setAllowCookiesEnabled(allow);
break;
case ContentSettingsType.GEOLOCATION:
PrefServiceBridgeJni.get().setAllowLocationEnabled(PrefServiceBridge.this, allow);
PrefServiceBridgeJni.get().setAllowLocationEnabled(allow);
break;
case ContentSettingsType.MEDIASTREAM_CAMERA:
PrefServiceBridgeJni.get().setCameraEnabled(PrefServiceBridge.this, allow);
PrefServiceBridgeJni.get().setCameraEnabled(allow);
break;
case ContentSettingsType.MEDIASTREAM_MIC:
PrefServiceBridgeJni.get().setMicEnabled(PrefServiceBridge.this, allow);
PrefServiceBridgeJni.get().setMicEnabled(allow);
break;
case ContentSettingsType.NOTIFICATIONS:
PrefServiceBridgeJni.get().setNotificationsEnabled(PrefServiceBridge.this, allow);
PrefServiceBridgeJni.get().setNotificationsEnabled(allow);
break;
case ContentSettingsType.SENSORS:
PrefServiceBridgeJni.get().setSensorsEnabled(PrefServiceBridge.this, allow);
PrefServiceBridgeJni.get().setSensorsEnabled(allow);
break;
case ContentSettingsType.SOUND:
PrefServiceBridgeJni.get().setSoundEnabled(PrefServiceBridge.this, allow);
PrefServiceBridgeJni.get().setSoundEnabled(allow);
break;
default:
assert false;
......@@ -590,24 +578,23 @@ public class PrefServiceBridge {
case ContentSettingsType.BLUETOOTH_SCANNING:
return isContentSettingEnabled(contentSettingsType);
case ContentSettingsType.AUTOMATIC_DOWNLOADS:
return PrefServiceBridgeJni.get().getAutomaticDownloadsEnabled(
PrefServiceBridge.this);
return PrefServiceBridgeJni.get().getAutomaticDownloadsEnabled();
case ContentSettingsType.AUTOPLAY:
return PrefServiceBridgeJni.get().getAutoplayEnabled(PrefServiceBridge.this);
return PrefServiceBridgeJni.get().getAutoplayEnabled();
case ContentSettingsType.BACKGROUND_SYNC:
return PrefServiceBridgeJni.get().getBackgroundSyncEnabled(PrefServiceBridge.this);
return PrefServiceBridgeJni.get().getBackgroundSyncEnabled();
case ContentSettingsType.COOKIES:
return PrefServiceBridgeJni.get().getAcceptCookiesEnabled(PrefServiceBridge.this);
return PrefServiceBridgeJni.get().getAcceptCookiesEnabled();
case ContentSettingsType.MEDIASTREAM_CAMERA:
return PrefServiceBridgeJni.get().getCameraEnabled(PrefServiceBridge.this);
return PrefServiceBridgeJni.get().getCameraEnabled();
case ContentSettingsType.MEDIASTREAM_MIC:
return PrefServiceBridgeJni.get().getMicEnabled(PrefServiceBridge.this);
return PrefServiceBridgeJni.get().getMicEnabled();
case ContentSettingsType.NOTIFICATIONS:
return PrefServiceBridgeJni.get().getNotificationsEnabled(PrefServiceBridge.this);
return PrefServiceBridgeJni.get().getNotificationsEnabled();
case ContentSettingsType.SENSORS:
return PrefServiceBridgeJni.get().getSensorsEnabled(PrefServiceBridge.this);
return PrefServiceBridgeJni.get().getSensorsEnabled();
case ContentSettingsType.SOUND:
return PrefServiceBridgeJni.get().getSoundEnabled(PrefServiceBridge.this);
return PrefServiceBridgeJni.get().getSoundEnabled();
default:
assert false;
return false;
......@@ -622,16 +609,14 @@ public class PrefServiceBridge {
* @return The ContentSetting for |contentSettingsType|.
*/
public int getContentSetting(int contentSettingsType) {
return PrefServiceBridgeJni.get().getContentSetting(
PrefServiceBridge.this, contentSettingsType);
return PrefServiceBridgeJni.get().getContentSetting(contentSettingsType);
}
/**
* @param setting New ContentSetting to set for |contentSettingsType|.
*/
public void setContentSetting(int contentSettingsType, int setting) {
PrefServiceBridgeJni.get().setContentSetting(
PrefServiceBridge.this, contentSettingsType, setting);
PrefServiceBridgeJni.get().setContentSetting(contentSettingsType, setting);
}
/**
......@@ -639,14 +624,14 @@ public class PrefServiceBridge {
* by the custodian of the supervised account.
*/
public boolean isCameraManagedByCustodian() {
return PrefServiceBridgeJni.get().getCameraManagedByCustodian(PrefServiceBridge.this);
return PrefServiceBridgeJni.get().getCameraManagedByCustodian();
}
/**
* @return Whether the camera permission is editable by the user.
*/
public boolean isCameraUserModifiable() {
return PrefServiceBridgeJni.get().getCameraUserModifiable(PrefServiceBridge.this);
return PrefServiceBridgeJni.get().getCameraUserModifiable();
}
/**
......@@ -654,28 +639,28 @@ public class PrefServiceBridge {
* the supervised account.
*/
public boolean isMicManagedByCustodian() {
return PrefServiceBridgeJni.get().getMicManagedByCustodian(PrefServiceBridge.this);
return PrefServiceBridgeJni.get().getMicManagedByCustodian();
}
/**
* @return Whether the microphone permission is editable by the user.
*/
public boolean isMicUserModifiable() {
return PrefServiceBridgeJni.get().getMicUserModifiable(PrefServiceBridge.this);
return PrefServiceBridgeJni.get().getMicUserModifiable();
}
/**
* @return true if incognito mode is enabled.
*/
public boolean isIncognitoModeEnabled() {
return PrefServiceBridgeJni.get().getIncognitoModeEnabled(PrefServiceBridge.this);
return PrefServiceBridgeJni.get().getIncognitoModeEnabled();
}
/**
* @return true if incognito mode is managed by policy.
*/
public boolean isIncognitoModeManaged() {
return PrefServiceBridgeJni.get().getIncognitoModeManaged(PrefServiceBridge.this);
return PrefServiceBridgeJni.get().getIncognitoModeManaged();
}
/**
......@@ -683,7 +668,7 @@ public class PrefServiceBridge {
* @return AboutVersionStrings about version strings.
*/
public AboutVersionStrings getAboutVersionStrings() {
return PrefServiceBridgeJni.get().getAboutVersionStrings(PrefServiceBridge.this);
return PrefServiceBridgeJni.get().getAboutVersionStrings();
}
/**
......@@ -692,7 +677,7 @@ public class PrefServiceBridge {
* @param defaultLocale A fall-back value such as en_US, de_DE, zh_CN, etc.
*/
public void resetAcceptLanguages(String defaultLocale) {
PrefServiceBridgeJni.get().resetAcceptLanguages(PrefServiceBridge.this, defaultLocale);
PrefServiceBridgeJni.get().resetAcceptLanguages(defaultLocale);
}
/**
......@@ -701,7 +686,7 @@ public class PrefServiceBridge {
*/
public List<LanguageItem> getChromeLanguageList() {
List<LanguageItem> list = new ArrayList<>();
PrefServiceBridgeJni.get().getChromeAcceptLanguages(PrefServiceBridge.this, list);
PrefServiceBridgeJni.get().getChromeAcceptLanguages(list);
return list;
}
......@@ -712,7 +697,7 @@ public class PrefServiceBridge {
*/
public List<String> getUserLanguageCodes() {
List<String> list = new ArrayList<>();
PrefServiceBridgeJni.get().getUserAcceptLanguages(PrefServiceBridge.this, list);
PrefServiceBridgeJni.get().getUserAcceptLanguages(list);
return list;
}
......@@ -723,8 +708,7 @@ public class PrefServiceBridge {
* @param add Whether this is an "add" operation or "delete" operation.
*/
public void updateUserAcceptLanguages(String languageCode, boolean add) {
PrefServiceBridgeJni.get().updateUserAcceptLanguages(
PrefServiceBridge.this, languageCode, add);
PrefServiceBridgeJni.get().updateUserAcceptLanguages(languageCode, add);
}
/**
......@@ -734,7 +718,7 @@ public class PrefServiceBridge {
* @param offset The offset from the original position of the language.
*/
public void moveAcceptLanguage(String languageCode, int offset) {
PrefServiceBridgeJni.get().moveAcceptLanguage(PrefServiceBridge.this, languageCode, offset);
PrefServiceBridgeJni.get().moveAcceptLanguage(languageCode, offset);
}
/**
......@@ -743,7 +727,7 @@ public class PrefServiceBridge {
* @param codes The new order for the user's accepted languages.
*/
public void setLanguageOrder(String[] codes) {
PrefServiceBridgeJni.get().setLanguageOrder(PrefServiceBridge.this, codes);
PrefServiceBridgeJni.get().setLanguageOrder(codes);
}
/**
......@@ -751,7 +735,7 @@ public class PrefServiceBridge {
* @return Whether the given language is blocked by the user.
*/
public boolean isBlockedLanguage(String languageCode) {
return PrefServiceBridgeJni.get().isBlockedLanguage(PrefServiceBridge.this, languageCode);
return PrefServiceBridgeJni.get().isBlockedLanguage(languageCode);
}
/**
......@@ -761,8 +745,7 @@ public class PrefServiceBridge {
* @param blocked Whether to set language blocked.
*/
public void setLanguageBlockedState(String languageCode, boolean blocked) {
PrefServiceBridgeJni.get().setLanguageBlockedState(
PrefServiceBridge.this, languageCode, blocked);
PrefServiceBridgeJni.get().setLanguageBlockedState(languageCode, blocked);
}
......@@ -770,43 +753,42 @@ public class PrefServiceBridge {
* @return Whether usage and crash reporting pref is enabled.
*/
public boolean isMetricsReportingEnabled() {
return PrefServiceBridgeJni.get().isMetricsReportingEnabled(PrefServiceBridge.this);
return PrefServiceBridgeJni.get().isMetricsReportingEnabled();
}
/**
* Sets whether the usage and crash reporting pref should be enabled.
*/
public void setMetricsReportingEnabled(boolean enabled) {
PrefServiceBridgeJni.get().setMetricsReportingEnabled(PrefServiceBridge.this, enabled);
PrefServiceBridgeJni.get().setMetricsReportingEnabled(enabled);
}
/**
* @return Whether usage and crash report pref is managed.
*/
public boolean isMetricsReportingManaged() {
return PrefServiceBridgeJni.get().isMetricsReportingManaged(PrefServiceBridge.this);
return PrefServiceBridgeJni.get().isMetricsReportingManaged();
}
/**
* @return The stored download default directory.
*/
public String getDownloadDefaultDirectory() {
return PrefServiceBridgeJni.get().getDownloadDefaultDirectory(PrefServiceBridge.this);
return PrefServiceBridgeJni.get().getDownloadDefaultDirectory();
}
/**
* @param directory New directory to set as the download default directory.
*/
public void setDownloadAndSaveFileDefaultDirectory(String directory) {
PrefServiceBridgeJni.get().setDownloadAndSaveFileDefaultDirectory(
PrefServiceBridge.this, directory);
PrefServiceBridgeJni.get().setDownloadAndSaveFileDefaultDirectory(directory);
}
/**
* @return Whether the explicit language prompt was shown at least once.
*/
public boolean getExplicitLanguageAskPromptShown() {
return PrefServiceBridgeJni.get().getExplicitLanguageAskPromptShown(PrefServiceBridge.this);
return PrefServiceBridgeJni.get().getExplicitLanguageAskPromptShown();
}
/**
......@@ -814,15 +796,19 @@ public class PrefServiceBridge {
* was shown to the user at least once.
*/
public void setExplicitLanguageAskPromptShown(boolean shown) {
PrefServiceBridgeJni.get().setExplicitLanguageAskPromptShown(PrefServiceBridge.this, shown);
PrefServiceBridgeJni.get().setExplicitLanguageAskPromptShown(shown);
}
/**
* @param enabled The value to set whether or not ForceWebContentsDarkMode is enabled.
*/
public void setForceWebContentsDarkModeEnabled(boolean enabled) {
PrefServiceBridgeJni.get().setForceWebContentsDarkModeEnabled(
PrefServiceBridge.this, enabled);
PrefServiceBridgeJni.get().setForceWebContentsDarkModeEnabled(enabled);
}
public void setContentSettingForPattern(int contentSettingType, String pattern, int setting) {
PrefServiceBridgeJni.get().setContentSettingForPattern(
contentSettingType, pattern, setting);
}
@VisibleForTesting
......@@ -832,96 +818,94 @@ public class PrefServiceBridge {
@NativeMethods
public interface Natives {
boolean isContentSettingEnabled(PrefServiceBridge caller, int contentSettingType);
boolean isContentSettingManaged(PrefServiceBridge caller, int contentSettingType);
void setContentSettingEnabled(
PrefServiceBridge caller, int contentSettingType, boolean allow);
void getContentSettingsExceptions(PrefServiceBridge caller, int contentSettingsType,
List<ContentSettingException> list);
void setContentSettingForPattern(
PrefServiceBridge caller, int contentSettingType, String pattern, int setting);
int getContentSetting(PrefServiceBridge caller, int contentSettingType);
void setContentSetting(PrefServiceBridge caller, int contentSettingType, int setting);
boolean getBoolean(PrefServiceBridge caller, int preference);
void setBoolean(PrefServiceBridge caller, int preference, boolean value);
int getInteger(PrefServiceBridge caller, int preference);
void setInteger(PrefServiceBridge caller, int preference, int value);
String getString(PrefServiceBridge caller, int preference);
void setString(PrefServiceBridge caller, int preference, String value);
boolean isManagedPreference(PrefServiceBridge caller, int preference);
boolean getAcceptCookiesEnabled(PrefServiceBridge caller);
boolean getAcceptCookiesUserModifiable(PrefServiceBridge caller);
boolean getAcceptCookiesManagedByCustodian(PrefServiceBridge caller);
boolean getAutomaticDownloadsEnabled(PrefServiceBridge caller);
boolean getAutoplayEnabled(PrefServiceBridge caller);
boolean getBackgroundSyncEnabled(PrefServiceBridge caller);
boolean getAllowLocationUserModifiable(PrefServiceBridge caller);
boolean getLocationAllowedByPolicy(PrefServiceBridge caller);
boolean getAllowLocationManagedByCustodian(PrefServiceBridge caller);
boolean getPasswordEchoEnabled(PrefServiceBridge caller);
boolean getFirstRunEulaAccepted(PrefServiceBridge caller);
boolean getCameraEnabled(PrefServiceBridge caller);
void setCameraEnabled(PrefServiceBridge caller, boolean enabled);
boolean getCameraUserModifiable(PrefServiceBridge caller);
boolean getCameraManagedByCustodian(PrefServiceBridge caller);
boolean getMicEnabled(PrefServiceBridge caller);
void setMicEnabled(PrefServiceBridge caller, boolean enabled);
boolean getMicUserModifiable(PrefServiceBridge caller);
boolean getMicManagedByCustodian(PrefServiceBridge caller);
boolean getTranslateEnabled(PrefServiceBridge caller);
boolean getTranslateManaged(PrefServiceBridge caller);
boolean getResolveNavigationErrorEnabled(PrefServiceBridge caller);
boolean getResolveNavigationErrorManaged(PrefServiceBridge caller);
boolean getIncognitoModeEnabled(PrefServiceBridge caller);
boolean getIncognitoModeManaged(PrefServiceBridge caller);
boolean getSensorsEnabled(PrefServiceBridge caller);
boolean getSoundEnabled(PrefServiceBridge caller);
void setTranslateEnabled(PrefServiceBridge caller, boolean enabled);
void migrateJavascriptPreference(PrefServiceBridge caller);
void setAutomaticDownloadsEnabled(PrefServiceBridge caller, boolean enabled);
void setAutoplayEnabled(PrefServiceBridge caller, boolean enabled);
void setAllowCookiesEnabled(PrefServiceBridge caller, boolean enabled);
void setBackgroundSyncEnabled(PrefServiceBridge caller, boolean enabled);
void setClipboardEnabled(PrefServiceBridge caller, boolean enabled);
boolean getAllowLocationEnabled(PrefServiceBridge caller);
boolean getNotificationsEnabled(PrefServiceBridge caller);
boolean getNotificationsVibrateEnabled(PrefServiceBridge caller);
void setAllowLocationEnabled(PrefServiceBridge caller, boolean enabled);
void setNotificationsEnabled(PrefServiceBridge caller, boolean enabled);
void setNotificationsVibrateEnabled(PrefServiceBridge caller, boolean enabled);
void setPasswordEchoEnabled(PrefServiceBridge caller, boolean enabled);
void setSensorsEnabled(PrefServiceBridge caller, boolean enabled);
void setSoundEnabled(PrefServiceBridge caller, boolean enabled);
boolean canPrefetchAndPrerender(PrefServiceBridge caller);
AboutVersionStrings getAboutVersionStrings(PrefServiceBridge caller);
boolean getSafeBrowsingExtendedReportingEnabled(PrefServiceBridge caller);
void setSafeBrowsingExtendedReportingEnabled(PrefServiceBridge caller, boolean enabled);
boolean getSafeBrowsingExtendedReportingManaged(PrefServiceBridge caller);
boolean getSafeBrowsingEnabled(PrefServiceBridge caller);
void setSafeBrowsingEnabled(PrefServiceBridge caller, boolean enabled);
boolean getSafeBrowsingManaged(PrefServiceBridge caller);
boolean getNetworkPredictionManaged(PrefServiceBridge caller);
boolean obsoleteNetworkPredictionOptionsHasUserSetting(PrefServiceBridge caller);
boolean getNetworkPredictionEnabled(PrefServiceBridge caller);
void setNetworkPredictionEnabled(PrefServiceBridge caller, boolean enabled);
void setResolveNavigationErrorEnabled(PrefServiceBridge caller, boolean enabled);
void setEulaAccepted(PrefServiceBridge caller);
void resetAcceptLanguages(PrefServiceBridge caller, String defaultLocale);
String getSyncLastAccountName(PrefServiceBridge caller);
boolean isMetricsReportingEnabled(PrefServiceBridge caller);
void setMetricsReportingEnabled(PrefServiceBridge caller, boolean enabled);
boolean isMetricsReportingManaged(PrefServiceBridge caller);
void getChromeAcceptLanguages(PrefServiceBridge caller, List<LanguageItem> list);
void getUserAcceptLanguages(PrefServiceBridge caller, List<String> list);
void updateUserAcceptLanguages(PrefServiceBridge caller, String language, boolean add);
void moveAcceptLanguage(PrefServiceBridge caller, String language, int offset);
void setLanguageOrder(PrefServiceBridge caller, String[] codes);
boolean isBlockedLanguage(PrefServiceBridge caller, String language);
void setLanguageBlockedState(PrefServiceBridge caller, String language, boolean blocked);
String getDownloadDefaultDirectory(PrefServiceBridge caller);
void setDownloadAndSaveFileDefaultDirectory(PrefServiceBridge caller, String directory);
boolean getExplicitLanguageAskPromptShown(PrefServiceBridge caller);
void setExplicitLanguageAskPromptShown(PrefServiceBridge caller, boolean shown);
void setForceWebContentsDarkModeEnabled(PrefServiceBridge caller, boolean enabled);
boolean isContentSettingEnabled(int contentSettingType);
boolean isContentSettingManaged(int contentSettingType);
void setContentSettingEnabled(int contentSettingType, boolean allow);
void getContentSettingsExceptions(
int contentSettingsType, List<ContentSettingException> list);
void setContentSettingForPattern(int contentSettingType, String pattern, int setting);
int getContentSetting(int contentSettingType);
void setContentSetting(int contentSettingType, int setting);
boolean getBoolean(int preference);
void setBoolean(int preference, boolean value);
int getInteger(int preference);
void setInteger(int preference, int value);
String getString(int preference);
void setString(int preference, String value);
boolean isManagedPreference(int preference);
boolean getAcceptCookiesEnabled();
boolean getAcceptCookiesUserModifiable();
boolean getAcceptCookiesManagedByCustodian();
boolean getAutomaticDownloadsEnabled();
boolean getAutoplayEnabled();
boolean getBackgroundSyncEnabled();
boolean getAllowLocationUserModifiable();
boolean getLocationAllowedByPolicy();
boolean getAllowLocationManagedByCustodian();
boolean getPasswordEchoEnabled();
boolean getFirstRunEulaAccepted();
boolean getCameraEnabled();
void setCameraEnabled(boolean enabled);
boolean getCameraUserModifiable();
boolean getCameraManagedByCustodian();
boolean getMicEnabled();
void setMicEnabled(boolean enabled);
boolean getMicUserModifiable();
boolean getMicManagedByCustodian();
boolean getTranslateEnabled();
boolean getTranslateManaged();
boolean getResolveNavigationErrorEnabled();
boolean getResolveNavigationErrorManaged();
boolean getIncognitoModeEnabled();
boolean getIncognitoModeManaged();
boolean getSensorsEnabled();
boolean getSoundEnabled();
void setTranslateEnabled(boolean enabled);
void migrateJavascriptPreference();
void setAutomaticDownloadsEnabled(boolean enabled);
void setAutoplayEnabled(boolean enabled);
void setAllowCookiesEnabled(boolean enabled);
void setBackgroundSyncEnabled(boolean enabled);
void setClipboardEnabled(boolean enabled);
boolean getAllowLocationEnabled();
boolean getNotificationsEnabled();
boolean getNotificationsVibrateEnabled();
void setAllowLocationEnabled(boolean enabled);
void setNotificationsEnabled(boolean enabled);
void setNotificationsVibrateEnabled(boolean enabled);
void setPasswordEchoEnabled(boolean enabled);
void setSensorsEnabled(boolean enabled);
void setSoundEnabled(boolean enabled);
boolean canPrefetchAndPrerender();
AboutVersionStrings getAboutVersionStrings();
boolean getSafeBrowsingExtendedReportingEnabled();
void setSafeBrowsingExtendedReportingEnabled(boolean enabled);
boolean getSafeBrowsingExtendedReportingManaged();
boolean getSafeBrowsingEnabled();
void setSafeBrowsingEnabled(boolean enabled);
boolean getSafeBrowsingManaged();
boolean getNetworkPredictionManaged();
boolean obsoleteNetworkPredictionOptionsHasUserSetting();
boolean getNetworkPredictionEnabled();
void setNetworkPredictionEnabled(boolean enabled);
void setResolveNavigationErrorEnabled(boolean enabled);
void setEulaAccepted();
void resetAcceptLanguages(String defaultLocale);
String getSyncLastAccountName();
boolean isMetricsReportingEnabled();
void setMetricsReportingEnabled(boolean enabled);
boolean isMetricsReportingManaged();
void getChromeAcceptLanguages(List<LanguageItem> list);
void getUserAcceptLanguages(List<String> list);
void updateUserAcceptLanguages(String language, boolean add);
void moveAcceptLanguage(String language, int offset);
void setLanguageOrder(String[] codes);
boolean isBlockedLanguage(String language);
void setLanguageBlockedState(String language, boolean blocked);
String getDownloadDefaultDirectory();
void setDownloadAndSaveFileDefaultDirectory(String directory);
boolean getExplicitLanguageAskPromptShown();
void setExplicitLanguageAskPromptShown(boolean shown);
void setForceWebContentsDarkModeEnabled(boolean enabled);
}
}
chrome/android/java/src/org/chromium/chrome/browser/preferences/website/ContentSettingException.java
View file @ 72df1c59
......@@ -9,7 +9,6 @@ import androidx.annotation.Nullable;
import org.chromium.chrome.browser.ContentSettingsType;
import org.chromium.chrome.browser.preferences.PrefServiceBridge;
import org.chromium.chrome.browser.preferences.PrefServiceBridgeJni;
import java.io.Serializable;
import java.lang.annotation.Retention;
......@@ -81,8 +80,8 @@ public class ContentSettingException implements Serializable {
* Sets the content setting value for this exception.
*/
public void setContentSetting(@ContentSettingValues @Nullable Integer value) {
PrefServiceBridgeJni.get().setContentSettingForPattern(
PrefServiceBridge.getInstance(), mContentSettingType, mPattern, value);
PrefServiceBridge.getInstance().setContentSettingForPattern(
mContentSettingType, mPattern, value);
}
public static @ContentSettingsType int getContentSettingsType(@Type int type) {
......
chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleCategoryPreferences.java
View file @ 72df1c59
......@@ -50,7 +50,6 @@ import org.chromium.chrome.browser.preferences.ManagedPreferenceDelegate;
import org.chromium.chrome.browser.preferences.ManagedPreferencesUtils;
import org.chromium.chrome.browser.preferences.Pref;
import org.chromium.chrome.browser.preferences.PrefServiceBridge;
import org.chromium.chrome.browser.preferences.PrefServiceBridgeJni;
import org.chromium.chrome.browser.preferences.PreferenceUtils;
import org.chromium.chrome.browser.preferences.SearchUtils;
import org.chromium.chrome.browser.preferences.website.Website.StoredDataClearedCallback;
......@@ -586,7 +585,7 @@ public class SingleCategoryPreferences extends PreferenceFragmentCompat
? ContentSettingValues.BLOCK
: ContentSettingValues.ALLOW;
PrefServiceBridgeJni.get().setContentSettingForPattern(PrefServiceBridge.getInstance(),
PrefServiceBridge.getInstance().setContentSettingForPattern(
mCategory.getContentSettingsType(), hostname, setting);
Toast.makeText(getActivity(),
String.format(getActivity().getString(
......
chrome/android/junit/src/org/chromium/chrome/browser/preferences/PrefServiceBridgeTest.java
View file @ 72df1c59
......@@ -44,7 +44,7 @@ public class PrefServiceBridgeTest {
boolean expected = false;
PrefServiceBridge prefServiceBridge = new PrefServiceBridge();
doReturn(expected).when(mNativeMock).getBoolean(prefServiceBridge, PREF);
doReturn(expected).when(mNativeMock).getBoolean(PREF);
assertEquals(expected, prefServiceBridge.getBoolean(PREF));
}
......@@ -56,7 +56,7 @@ public class PrefServiceBridgeTest {
PrefServiceBridge prefServiceBridge = new PrefServiceBridge();
prefServiceBridge.setBoolean(PREF, value);
verify(mNativeMock).setBoolean(eq(prefServiceBridge), eq(PREF), eq(value));
verify(mNativeMock).setBoolean(eq(PREF), eq(value));
}
@Test
......@@ -64,7 +64,7 @@ public class PrefServiceBridgeTest {
int expected = 26;
PrefServiceBridge prefServiceBridge = new PrefServiceBridge();
doReturn(expected).when(mNativeMock).getInteger(prefServiceBridge, PREF);
doReturn(expected).when(mNativeMock).getInteger(PREF);
assertEquals(expected, prefServiceBridge.getInteger(PREF));
}
......@@ -76,7 +76,7 @@ public class PrefServiceBridgeTest {
PrefServiceBridge prefServiceBridge = new PrefServiceBridge();
prefServiceBridge.setInteger(PREF, value);
verify(mNativeMock).setInteger(eq(prefServiceBridge), eq(PREF), eq(value));
verify(mNativeMock).setInteger(eq(PREF), eq(value));
}
@Test
......@@ -84,7 +84,7 @@ public class PrefServiceBridgeTest {
String expected = "foo";
PrefServiceBridge prefServiceBridge = new PrefServiceBridge();
doReturn(expected).when(mNativeMock).getString(prefServiceBridge, PREF);
doReturn(expected).when(mNativeMock).getString(PREF);
assertEquals(expected, prefServiceBridge.getString(PREF));
}
......@@ -96,7 +96,7 @@ public class PrefServiceBridgeTest {
PrefServiceBridge prefServiceBridge = new PrefServiceBridge();
prefServiceBridge.setString(PREF, value);
verify(mNativeMock).setString(eq(prefServiceBridge), eq(PREF), eq(value));
verify(mNativeMock).setString(eq(PREF), eq(value));
}
@Test
......@@ -104,7 +104,7 @@ public class PrefServiceBridgeTest {
boolean expected = true;
PrefServiceBridge prefServiceBridge = new PrefServiceBridge();
doReturn(expected).when(mNativeMock).isManagedPreference(prefServiceBridge, PREF);
doReturn(expected).when(mNativeMock).isManagedPreference(PREF);
assertEquals(expected, prefServiceBridge.isManagedPreference(PREF));
}
......
chrome/browser/android/preferences/pref_service_bridge.cc
View file @ 72df1c59
......@@ -124,14 +124,12 @@ PrefService* GetPrefService() {
static jboolean JNI_PrefServiceBridge_GetBoolean(
JNIEnv* env,
const JavaParamRef<jobject>& obj,
const jint j_pref_index) {
return GetPrefService()->GetBoolean(
PrefServiceBridge::GetPrefNameExposedToJava(j_pref_index));
}
static void JNI_PrefServiceBridge_SetBoolean(JNIEnv* env,
const JavaParamRef<jobject>& obj,
const jint j_pref_index,
const jboolean j_value) {
GetPrefService()->SetBoolean(
......@@ -139,14 +137,12 @@ static void JNI_PrefServiceBridge_SetBoolean(JNIEnv* env,
}
static jint JNI_PrefServiceBridge_GetInteger(JNIEnv* env,
const JavaParamRef<jobject>& obj,
const jint j_pref_index) {
return GetPrefService()->GetInteger(
PrefServiceBridge::GetPrefNameExposedToJava(j_pref_index));
}
static void JNI_PrefServiceBridge_SetInteger(JNIEnv* env,
const JavaParamRef<jobject>& obj,
const jint j_pref_index,
const jint j_value) {
GetPrefService()->SetInteger(
......@@ -155,7 +151,6 @@ static void JNI_PrefServiceBridge_SetInteger(JNIEnv* env,
static ScopedJavaLocalRef<jstring> JNI_PrefServiceBridge_GetString(
JNIEnv* env,
const JavaParamRef<jobject>& obj,
const jint j_pref_index) {
return ConvertUTF8ToJavaString(
env, GetPrefService()->GetString(
......@@ -164,7 +159,6 @@ static ScopedJavaLocalRef<jstring> JNI_PrefServiceBridge_GetString(
static void JNI_PrefServiceBridge_SetString(
JNIEnv* env,
const JavaParamRef<jobject>& obj,
const jint j_pref_index,
const JavaParamRef<jstring>& j_value) {
GetPrefService()->SetString(
......@@ -174,7 +168,6 @@ static void JNI_PrefServiceBridge_SetString(
static jboolean JNI_PrefServiceBridge_IsManagedPreference(
JNIEnv* env,
const JavaParamRef<jobject>& obj,
const jint j_pref_index) {
return GetPrefService()->IsManagedPreference(
PrefServiceBridge::GetPrefNameExposedToJava(j_pref_index));
......@@ -182,7 +175,6 @@ static jboolean JNI_PrefServiceBridge_IsManagedPreference(
static jboolean JNI_PrefServiceBridge_IsContentSettingManaged(
JNIEnv* env,
const JavaParamRef<jobject>& obj,
int content_settings_type) {
return IsContentSettingManaged(
static_cast<ContentSettingsType>(content_settings_type));
......@@ -190,7 +182,6 @@ static jboolean JNI_PrefServiceBridge_IsContentSettingManaged(
static jboolean JNI_PrefServiceBridge_IsContentSettingEnabled(
JNIEnv* env,
const JavaParamRef<jobject>& obj,
int content_settings_type) {
ContentSettingsType type =
static_cast<ContentSettingsType>(content_settings_type);
......@@ -207,7 +198,6 @@ static jboolean JNI_PrefServiceBridge_IsContentSettingEnabled(
static void JNI_PrefServiceBridge_SetContentSettingEnabled(
JNIEnv* env,
const JavaParamRef<jobject>& obj,
int content_settings_type,
jboolean allow) {
ContentSettingsType type =
......@@ -238,7 +228,6 @@ static void JNI_PrefServiceBridge_SetContentSettingEnabled(
static void JNI_PrefServiceBridge_SetContentSettingForPattern(
JNIEnv* env,
const JavaParamRef<jobject>& obj,
int content_settings_type,
const JavaParamRef<jstring>& pattern,
int setting) {
......@@ -253,7 +242,6 @@ static void JNI_PrefServiceBridge_SetContentSettingForPattern(
static void JNI_PrefServiceBridge_GetContentSettingsExceptions(
JNIEnv* env,
const JavaParamRef<jobject>& obj,
int content_settings_type,
const JavaParamRef<jobject>& list) {
HostContentSettingsMap* host_content_settings_map =
......@@ -272,7 +260,6 @@ static void JNI_PrefServiceBridge_GetContentSettingsExceptions(
static jint JNI_PrefServiceBridge_GetContentSetting(
JNIEnv* env,
const JavaParamRef<jobject>& obj,
int content_settings_type) {
HostContentSettingsMap* content_settings =
HostContentSettingsMapFactory::GetForProfile(GetOriginalProfile());
......@@ -282,7 +269,6 @@ static jint JNI_PrefServiceBridge_GetContentSetting(
static void JNI_PrefServiceBridge_SetContentSetting(
JNIEnv* env,
const JavaParamRef<jobject>& obj,
int content_settings_type,
int setting) {
HostContentSettingsMap* host_content_settings_map =
......@@ -292,95 +278,70 @@ static void JNI_PrefServiceBridge_SetContentSetting(
static_cast<ContentSetting>(setting));
}
static jboolean JNI_PrefServiceBridge_GetAcceptCookiesEnabled(
JNIEnv* env,
const JavaParamRef<jobject>& obj) {
static jboolean JNI_PrefServiceBridge_GetAcceptCookiesEnabled(JNIEnv* env) {
return GetBooleanForContentSetting(ContentSettingsType::COOKIES);
}
static jboolean JNI_PrefServiceBridge_GetAcceptCookiesUserModifiable(
JNIEnv* env,
const JavaParamRef<jobject>& obj) {
JNIEnv* env) {
return IsContentSettingUserModifiable(ContentSettingsType::COOKIES);
}
static jboolean JNI_PrefServiceBridge_GetAcceptCookiesManagedByCustodian(
JNIEnv* env,
const JavaParamRef<jobject>& obj) {
JNIEnv* env) {
return IsContentSettingManagedByCustodian(ContentSettingsType::COOKIES);
}
static jboolean JNI_PrefServiceBridge_GetAutoplayEnabled(
JNIEnv* env,
const JavaParamRef<jobject>& obj) {
static jboolean JNI_PrefServiceBridge_GetAutoplayEnabled(JNIEnv* env) {
return GetBooleanForContentSetting(ContentSettingsType::AUTOPLAY);
}
static jboolean JNI_PrefServiceBridge_GetSensorsEnabled(
JNIEnv* env,
const JavaParamRef<jobject>& obj) {
static jboolean JNI_PrefServiceBridge_GetSensorsEnabled(JNIEnv* env) {
return GetBooleanForContentSetting(ContentSettingsType::SENSORS);
}
static jboolean JNI_PrefServiceBridge_GetSoundEnabled(
JNIEnv* env,
const JavaParamRef<jobject>& obj) {
static jboolean JNI_PrefServiceBridge_GetSoundEnabled(JNIEnv* env) {
return GetBooleanForContentSetting(ContentSettingsType::SOUND);
}
static jboolean JNI_PrefServiceBridge_GetBackgroundSyncEnabled(
JNIEnv* env,
const JavaParamRef<jobject>& obj) {
static jboolean JNI_PrefServiceBridge_GetBackgroundSyncEnabled(JNIEnv* env) {
return GetBooleanForContentSetting(ContentSettingsType::BACKGROUND_SYNC);
}
static jboolean JNI_PrefServiceBridge_GetAutomaticDownloadsEnabled(
JNIEnv* env,
const JavaParamRef<jobject>& obj) {
JNIEnv* env) {
return GetBooleanForContentSetting(ContentSettingsType::AUTOMATIC_DOWNLOADS);
}
static jboolean JNI_PrefServiceBridge_GetNetworkPredictionEnabled(
JNIEnv* env,
const JavaParamRef<jobject>& obj) {
static jboolean JNI_PrefServiceBridge_GetNetworkPredictionEnabled(JNIEnv* env) {
return GetPrefService()->GetInteger(prefs::kNetworkPredictionOptions)
!= chrome_browser_net::NETWORK_PREDICTION_NEVER;
}
static jboolean JNI_PrefServiceBridge_GetNetworkPredictionManaged(
JNIEnv* env,
const JavaParamRef<jobject>& obj) {
static jboolean JNI_PrefServiceBridge_GetNetworkPredictionManaged(JNIEnv* env) {
return GetPrefService()->IsManagedPreference(
prefs::kNetworkPredictionOptions);
}
static jboolean JNI_PrefServiceBridge_GetPasswordEchoEnabled(
JNIEnv* env,
const JavaParamRef<jobject>& obj) {
static jboolean JNI_PrefServiceBridge_GetPasswordEchoEnabled(JNIEnv* env) {
return GetPrefService()->GetBoolean(prefs::kWebKitPasswordEchoEnabled);
}
static jboolean JNI_PrefServiceBridge_GetTranslateEnabled(
JNIEnv* env,
const JavaParamRef<jobject>& obj) {
static jboolean JNI_PrefServiceBridge_GetTranslateEnabled(JNIEnv* env) {
return GetPrefService()->GetBoolean(prefs::kOfferTranslateEnabled);
}
static jboolean JNI_PrefServiceBridge_GetTranslateManaged(
JNIEnv* env,
const JavaParamRef<jobject>& obj) {
static jboolean JNI_PrefServiceBridge_GetTranslateManaged(JNIEnv* env) {
return GetPrefService()->IsManagedPreference(prefs::kOfferTranslateEnabled);
}
static jboolean JNI_PrefServiceBridge_GetSafeBrowsingExtendedReportingEnabled(
JNIEnv* env,
const JavaParamRef<jobject>& obj) {
JNIEnv* env) {
return safe_browsing::IsExtendedReportingEnabled(*GetPrefService());
}
static void JNI_PrefServiceBridge_SetSafeBrowsingExtendedReportingEnabled(
JNIEnv* env,
const JavaParamRef<jobject>& obj,
jboolean enabled) {
safe_browsing::SetExtendedReportingPrefAndMetric(
GetPrefService(), enabled,
......@@ -388,53 +349,40 @@ static void JNI_PrefServiceBridge_SetSafeBrowsingExtendedReportingEnabled(
}
static jboolean JNI_PrefServiceBridge_GetSafeBrowsingExtendedReportingManaged(
JNIEnv* env,
const JavaParamRef<jobject>& obj) {
JNIEnv* env) {
PrefService* pref_service = GetPrefService();
return pref_service->IsManagedPreference(
prefs::kSafeBrowsingScoutReportingEnabled);
}
static jboolean JNI_PrefServiceBridge_GetSafeBrowsingEnabled(
JNIEnv* env,
const JavaParamRef<jobject>& obj) {
static jboolean JNI_PrefServiceBridge_GetSafeBrowsingEnabled(JNIEnv* env) {
return GetPrefService()->GetBoolean(prefs::kSafeBrowsingEnabled);
}
static void JNI_PrefServiceBridge_SetSafeBrowsingEnabled(
JNIEnv* env,
const JavaParamRef<jobject>& obj,
jboolean enabled) {
GetPrefService()->SetBoolean(prefs::kSafeBrowsingEnabled, enabled);
}
static jboolean JNI_PrefServiceBridge_GetSafeBrowsingManaged(
JNIEnv* env,
const JavaParamRef<jobject>& obj) {
static jboolean JNI_PrefServiceBridge_GetSafeBrowsingManaged(JNIEnv* env) {
return GetPrefService()->IsManagedPreference(prefs::kSafeBrowsingEnabled);
}
static jboolean JNI_PrefServiceBridge_GetNotificationsEnabled(
JNIEnv* env,
const JavaParamRef<jobject>& obj) {
static jboolean JNI_PrefServiceBridge_GetNotificationsEnabled(JNIEnv* env) {
return GetBooleanForContentSetting(ContentSettingsType::NOTIFICATIONS);
}
static jboolean JNI_PrefServiceBridge_GetNotificationsVibrateEnabled(
JNIEnv* env,
const JavaParamRef<jobject>& obj) {
JNIEnv* env) {
return GetPrefService()->GetBoolean(prefs::kNotificationsVibrateEnabled);
}
static jboolean JNI_PrefServiceBridge_GetAllowLocationEnabled(
JNIEnv* env,
const JavaParamRef<jobject>& obj) {
static jboolean JNI_PrefServiceBridge_GetAllowLocationEnabled(JNIEnv* env) {
return GetBooleanForContentSetting(ContentSettingsType::GEOLOCATION);
}
static jboolean JNI_PrefServiceBridge_GetLocationAllowedByPolicy(
JNIEnv* env,
const JavaParamRef<jobject>& obj) {
static jboolean JNI_PrefServiceBridge_GetLocationAllowedByPolicy(JNIEnv* env) {
if (!IsContentSettingManaged(ContentSettingsType::GEOLOCATION))
return false;
HostContentSettingsMap* content_settings =
......@@ -445,32 +393,26 @@ static jboolean JNI_PrefServiceBridge_GetLocationAllowedByPolicy(
}
static jboolean JNI_PrefServiceBridge_GetAllowLocationUserModifiable(
JNIEnv* env,
const JavaParamRef<jobject>& obj) {
JNIEnv* env) {
return IsContentSettingUserModifiable(ContentSettingsType::GEOLOCATION);
}
static jboolean JNI_PrefServiceBridge_GetAllowLocationManagedByCustodian(
JNIEnv* env,
const JavaParamRef<jobject>& obj) {
JNIEnv* env) {
return IsContentSettingManagedByCustodian(ContentSettingsType::GEOLOCATION);
}
static jboolean JNI_PrefServiceBridge_GetResolveNavigationErrorEnabled(
JNIEnv* env,
const JavaParamRef<jobject>& obj) {
JNIEnv* env) {
return GetPrefService()->GetBoolean(prefs::kAlternateErrorPagesEnabled);
}
static jboolean JNI_PrefServiceBridge_GetResolveNavigationErrorManaged(
JNIEnv* env,
const JavaParamRef<jobject>& obj) {
JNIEnv* env) {
return GetPrefService()->IsManagedPreference(
prefs::kAlternateErrorPagesEnabled);
}
static jboolean JNI_PrefServiceBridge_GetIncognitoModeEnabled(
JNIEnv* env,
const JavaParamRef<jobject>& obj) {
static jboolean JNI_PrefServiceBridge_GetIncognitoModeEnabled(JNIEnv* env) {
PrefService* prefs = GetPrefService();
IncognitoModePrefs::Availability incognito_pref =
IncognitoModePrefs::GetAvailability(prefs);
......@@ -480,38 +422,30 @@ static jboolean JNI_PrefServiceBridge_GetIncognitoModeEnabled(
return incognito_pref != IncognitoModePrefs::DISABLED;
}
static jboolean JNI_PrefServiceBridge_GetIncognitoModeManaged(
JNIEnv* env,
const JavaParamRef<jobject>& obj) {
static jboolean JNI_PrefServiceBridge_GetIncognitoModeManaged(JNIEnv* env) {
return GetPrefService()->IsManagedPreference(
prefs::kIncognitoModeAvailability);
}
static jboolean JNI_PrefServiceBridge_IsMetricsReportingEnabled(
JNIEnv* env,
const JavaParamRef<jobject>& obj) {
static jboolean JNI_PrefServiceBridge_IsMetricsReportingEnabled(JNIEnv* env) {
PrefService* local_state = g_browser_process->local_state();
return local_state->GetBoolean(metrics::prefs::kMetricsReportingEnabled);
}
static void JNI_PrefServiceBridge_SetMetricsReportingEnabled(
JNIEnv* env,
const JavaParamRef<jobject>& obj,
jboolean enabled) {
PrefService* local_state = g_browser_process->local_state();
local_state->SetBoolean(metrics::prefs::kMetricsReportingEnabled, enabled);
}
static jboolean JNI_PrefServiceBridge_IsMetricsReportingManaged(
JNIEnv* env,
const JavaParamRef<jobject>& obj) {
static jboolean JNI_PrefServiceBridge_IsMetricsReportingManaged(JNIEnv* env) {
return GetPrefService()->IsManagedPreference(
metrics::prefs::kMetricsReportingEnabled);
}
static void JNI_PrefServiceBridge_SetAutoplayEnabled(
JNIEnv* env,
const JavaParamRef<jobject>& obj,
jboolean allow) {
HostContentSettingsMap* host_content_settings_map =
HostContentSettingsMapFactory::GetForProfile(GetOriginalProfile());
......@@ -522,7 +456,6 @@ static void JNI_PrefServiceBridge_SetAutoplayEnabled(
static void JNI_PrefServiceBridge_SetClipboardEnabled(
JNIEnv* env,
const JavaParamRef<jobject>& obj,
jboolean allow) {
HostContentSettingsMap* host_content_settings_map =
HostContentSettingsMapFactory::GetForProfile(GetOriginalProfile());
......@@ -533,7 +466,6 @@ static void JNI_PrefServiceBridge_SetClipboardEnabled(
static void JNI_PrefServiceBridge_SetSensorsEnabled(
JNIEnv* env,
const JavaParamRef<jobject>& obj,
jboolean allow) {
HostContentSettingsMap* host_content_settings_map =
HostContentSettingsMapFactory::GetForProfile(GetOriginalProfile());
......@@ -544,7 +476,6 @@ static void JNI_PrefServiceBridge_SetSensorsEnabled(
static void JNI_PrefServiceBridge_SetSoundEnabled(
JNIEnv* env,
const JavaParamRef<jobject>& obj,
jboolean allow) {
HostContentSettingsMap* host_content_settings_map =
HostContentSettingsMapFactory::GetForProfile(GetOriginalProfile());
......@@ -563,7 +494,6 @@ static void JNI_PrefServiceBridge_SetSoundEnabled(
static void JNI_PrefServiceBridge_SetAllowCookiesEnabled(
JNIEnv* env,
const JavaParamRef<jobject>& obj,
jboolean allow) {
HostContentSettingsMap* host_content_settings_map =
HostContentSettingsMapFactory::GetForProfile(GetOriginalProfile());
......@@ -574,7 +504,6 @@ static void JNI_PrefServiceBridge_SetAllowCookiesEnabled(
static void JNI_PrefServiceBridge_SetBackgroundSyncEnabled(
JNIEnv* env,
const JavaParamRef<jobject>& obj,
jboolean allow) {
HostContentSettingsMap* host_content_settings_map =
HostContentSettingsMapFactory::GetForProfile(GetOriginalProfile());
......@@ -585,7 +514,6 @@ static void JNI_PrefServiceBridge_SetBackgroundSyncEnabled(
static void JNI_PrefServiceBridge_SetAutomaticDownloadsEnabled(
JNIEnv* env,
const JavaParamRef<jobject>& obj,
jboolean allow) {
HostContentSettingsMap* host_content_settings_map =
HostContentSettingsMapFactory::GetForProfile(GetOriginalProfile());
......@@ -596,7 +524,6 @@ static void JNI_PrefServiceBridge_SetAutomaticDownloadsEnabled(
static void JNI_PrefServiceBridge_SetAllowLocationEnabled(
JNIEnv* env,
const JavaParamRef<jobject>& obj,
jboolean is_enabled) {
HostContentSettingsMap* host_content_settings_map =
HostContentSettingsMapFactory::GetForProfile(GetOriginalProfile());
......@@ -607,7 +534,6 @@ static void JNI_PrefServiceBridge_SetAllowLocationEnabled(
static void JNI_PrefServiceBridge_SetCameraEnabled(
JNIEnv* env,
const JavaParamRef<jobject>& obj,
jboolean allow) {
HostContentSettingsMap* host_content_settings_map =
HostContentSettingsMapFactory::GetForProfile(GetOriginalProfile());
......@@ -618,7 +544,6 @@ static void JNI_PrefServiceBridge_SetCameraEnabled(
static void JNI_PrefServiceBridge_SetMicEnabled(
JNIEnv* env,
const JavaParamRef<jobject>& obj,
jboolean allow) {
HostContentSettingsMap* host_content_settings_map =
HostContentSettingsMapFactory::GetForProfile(GetOriginalProfile());
......@@ -629,7 +554,6 @@ static void JNI_PrefServiceBridge_SetMicEnabled(
static void JNI_PrefServiceBridge_SetNotificationsEnabled(
JNIEnv* env,
const JavaParamRef<jobject>& obj,
jboolean allow) {
HostContentSettingsMap* host_content_settings_map =
HostContentSettingsMapFactory::GetForProfile(GetOriginalProfile());
......@@ -640,35 +564,28 @@ static void JNI_PrefServiceBridge_SetNotificationsEnabled(
static void JNI_PrefServiceBridge_SetNotificationsVibrateEnabled(
JNIEnv* env,
const JavaParamRef<jobject>& obj,
jboolean enabled) {
GetPrefService()->SetBoolean(prefs::kNotificationsVibrateEnabled, enabled);
}
static jboolean JNI_PrefServiceBridge_CanPrefetchAndPrerender(
JNIEnv* env,
const JavaParamRef<jobject>& obj) {
static jboolean JNI_PrefServiceBridge_CanPrefetchAndPrerender(JNIEnv* env) {
return chrome_browser_net::CanPrefetchAndPrerenderUI(GetPrefService()) ==
chrome_browser_net::NetworkPredictionStatus::ENABLED;
}
static ScopedJavaLocalRef<jstring> JNI_PrefServiceBridge_GetSyncLastAccountName(
JNIEnv* env,
const JavaParamRef<jobject>& obj) {
JNIEnv* env) {
return ConvertUTF8ToJavaString(
env, GetPrefService()->GetString(prefs::kGoogleServicesLastUsername));
}
static void JNI_PrefServiceBridge_SetTranslateEnabled(
JNIEnv* env,
const JavaParamRef<jobject>& obj,
jboolean enabled) {
GetPrefService()->SetBoolean(prefs::kOfferTranslateEnabled, enabled);
}
static void JNI_PrefServiceBridge_MigrateJavascriptPreference(
JNIEnv* env,
const JavaParamRef<jobject>& obj) {
static void JNI_PrefServiceBridge_MigrateJavascriptPreference(JNIEnv* env) {
const PrefService::Preference* javascript_pref =
GetPrefService()->FindPreference(prefs::kWebKitJavascriptEnabled);
DCHECK(javascript_pref);
......@@ -680,61 +597,47 @@ static void JNI_PrefServiceBridge_MigrateJavascriptPreference(
bool retval = javascript_pref->GetValue()->GetAsBoolean(&javascript_enabled);
DCHECK(retval);
JNI_PrefServiceBridge_SetContentSettingEnabled(
env, obj, static_cast<int>(ContentSettingsType::JAVASCRIPT),
env, static_cast<int>(ContentSettingsType::JAVASCRIPT),
javascript_enabled);
GetPrefService()->ClearPref(prefs::kWebKitJavascriptEnabled);
}
static void JNI_PrefServiceBridge_SetPasswordEchoEnabled(
JNIEnv* env,
const JavaParamRef<jobject>& obj,
jboolean passwordEchoEnabled) {
GetPrefService()->SetBoolean(prefs::kWebKitPasswordEchoEnabled,
passwordEchoEnabled);
}
static jboolean JNI_PrefServiceBridge_GetCameraEnabled(
JNIEnv* env,
const JavaParamRef<jobject>& obj) {
static jboolean JNI_PrefServiceBridge_GetCameraEnabled(JNIEnv* env) {
return GetBooleanForContentSetting(ContentSettingsType::MEDIASTREAM_CAMERA);
}
static jboolean JNI_PrefServiceBridge_GetCameraUserModifiable(
JNIEnv* env,
const JavaParamRef<jobject>& obj) {
static jboolean JNI_PrefServiceBridge_GetCameraUserModifiable(JNIEnv* env) {
return IsContentSettingUserModifiable(
ContentSettingsType::MEDIASTREAM_CAMERA);
}
static jboolean JNI_PrefServiceBridge_GetCameraManagedByCustodian(
JNIEnv* env,
const JavaParamRef<jobject>& obj) {
static jboolean JNI_PrefServiceBridge_GetCameraManagedByCustodian(JNIEnv* env) {
return IsContentSettingManagedByCustodian(
ContentSettingsType::MEDIASTREAM_CAMERA);
}
static jboolean JNI_PrefServiceBridge_GetMicEnabled(
JNIEnv* env,
const JavaParamRef<jobject>& obj) {
static jboolean JNI_PrefServiceBridge_GetMicEnabled(JNIEnv* env) {
return GetBooleanForContentSetting(ContentSettingsType::MEDIASTREAM_MIC);
}
static jboolean JNI_PrefServiceBridge_GetMicUserModifiable(
JNIEnv* env,
const JavaParamRef<jobject>& obj) {
static jboolean JNI_PrefServiceBridge_GetMicUserModifiable(JNIEnv* env) {
return IsContentSettingUserModifiable(ContentSettingsType::MEDIASTREAM_MIC);
}
static jboolean JNI_PrefServiceBridge_GetMicManagedByCustodian(
JNIEnv* env,
const JavaParamRef<jobject>& obj) {
static jboolean JNI_PrefServiceBridge_GetMicManagedByCustodian(JNIEnv* env) {
return IsContentSettingManagedByCustodian(
ContentSettingsType::MEDIASTREAM_MIC);
}
static void JNI_PrefServiceBridge_SetNetworkPredictionEnabled(
JNIEnv* env,
const JavaParamRef<jobject>& obj,
jboolean enabled) {
GetPrefService()->SetInteger(
prefs::kNetworkPredictionOptions,
......@@ -744,34 +647,27 @@ static void JNI_PrefServiceBridge_SetNetworkPredictionEnabled(
static jboolean
JNI_PrefServiceBridge_ObsoleteNetworkPredictionOptionsHasUserSetting(
JNIEnv* env,
const JavaParamRef<jobject>& obj) {
JNIEnv* env) {
return GetPrefService()->GetUserPrefValue(
prefs::kNetworkPredictionOptions) != NULL;
}
static void JNI_PrefServiceBridge_SetResolveNavigationErrorEnabled(
JNIEnv* env,
const JavaParamRef<jobject>& obj,
jboolean enabled) {
GetPrefService()->SetBoolean(prefs::kAlternateErrorPagesEnabled, enabled);
}
static jboolean JNI_PrefServiceBridge_GetFirstRunEulaAccepted(
JNIEnv* env,
const JavaParamRef<jobject>& obj) {
static jboolean JNI_PrefServiceBridge_GetFirstRunEulaAccepted(JNIEnv* env) {
return g_browser_process->local_state()->GetBoolean(prefs::kEulaAccepted);
}
static void JNI_PrefServiceBridge_SetEulaAccepted(
JNIEnv* env,
const JavaParamRef<jobject>& obj) {
static void JNI_PrefServiceBridge_SetEulaAccepted(JNIEnv* env) {
g_browser_process->local_state()->SetBoolean(prefs::kEulaAccepted, true);
}
static void JNI_PrefServiceBridge_ResetAcceptLanguages(
JNIEnv* env,
const JavaParamRef<jobject>& obj,
const JavaParamRef<jstring>& default_locale) {
std::string accept_languages(l10n_util::GetStringUTF8(IDS_ACCEPT_LANGUAGES));
std::string locale_string(ConvertJavaStringToUTF8(env, default_locale));
......@@ -785,8 +681,7 @@ static void JNI_PrefServiceBridge_ResetAcceptLanguages(
// Sends all information about the different versions to Java.
// From browser_about_handler.cc
static ScopedJavaLocalRef<jobject> JNI_PrefServiceBridge_GetAboutVersionStrings(
JNIEnv* env,
const JavaParamRef<jobject>& obj) {
JNIEnv* env) {
std::string os_version = version_info::GetOSType();
os_version += " " + AndroidAboutAppInfo::GetOsInfo();
......@@ -893,7 +788,6 @@ void PrefServiceBridge::GetAndroidPermissionsForContentSetting(
static void JNI_PrefServiceBridge_GetChromeAcceptLanguages(
JNIEnv* env,
const JavaParamRef<jobject>& obj,
const JavaParamRef<jobject>& list) {
std::unique_ptr<translate::TranslatePrefs> translate_prefs =
ChromeTranslateClient::CreateTranslatePrefs(GetPrefService());
......@@ -922,7 +816,6 @@ static void JNI_PrefServiceBridge_GetChromeAcceptLanguages(
static void JNI_PrefServiceBridge_GetUserAcceptLanguages(
JNIEnv* env,
const JavaParamRef<jobject>& obj,
const JavaParamRef<jobject>& list) {
std::unique_ptr<translate::TranslatePrefs> translate_prefs =
ChromeTranslateClient::CreateTranslatePrefs(GetPrefService());
......@@ -935,7 +828,6 @@ static void JNI_PrefServiceBridge_GetUserAcceptLanguages(
static void JNI_PrefServiceBridge_SetLanguageOrder(
JNIEnv* env,
const JavaParamRef<jobject>& obj,
const JavaParamRef<jobjectArray>& j_order) {
std::unique_ptr<translate::TranslatePrefs> translate_prefs =
ChromeTranslateClient::CreateTranslatePrefs(GetPrefService());
......@@ -950,7 +842,6 @@ static void JNI_PrefServiceBridge_SetLanguageOrder(
static void JNI_PrefServiceBridge_UpdateUserAcceptLanguages(
JNIEnv* env,
const JavaParamRef<jobject>& obj,
const JavaParamRef<jstring>& language,
jboolean is_add) {
std::unique_ptr<translate::TranslatePrefs> translate_prefs =
......@@ -966,7 +857,6 @@ static void JNI_PrefServiceBridge_UpdateUserAcceptLanguages(
static void JNI_PrefServiceBridge_MoveAcceptLanguage(
JNIEnv* env,
const JavaParamRef<jobject>& obj,
const JavaParamRef<jstring>& language,
jint offset) {
std::unique_ptr<translate::TranslatePrefs> translate_prefs =
......@@ -992,7 +882,6 @@ static void JNI_PrefServiceBridge_MoveAcceptLanguage(
static jboolean JNI_PrefServiceBridge_IsBlockedLanguage(
JNIEnv* env,
const JavaParamRef<jobject>& obj,
const JavaParamRef<jstring>& language) {
std::unique_ptr<translate::TranslatePrefs> translate_prefs =
ChromeTranslateClient::CreateTranslatePrefs(GetPrefService());
......@@ -1011,7 +900,6 @@ static jboolean JNI_PrefServiceBridge_IsBlockedLanguage(
static void JNI_PrefServiceBridge_SetLanguageBlockedState(
JNIEnv* env,
const JavaParamRef<jobject>& obj,
const JavaParamRef<jstring>& language,
jboolean blocked) {
std::unique_ptr<translate::TranslatePrefs> translate_prefs =
......@@ -1026,16 +914,13 @@ static void JNI_PrefServiceBridge_SetLanguageBlockedState(
}
static ScopedJavaLocalRef<jstring>
JNI_PrefServiceBridge_GetDownloadDefaultDirectory(
JNIEnv* env,
const JavaParamRef<jobject>& obj) {
JNI_PrefServiceBridge_GetDownloadDefaultDirectory(JNIEnv* env) {
return ConvertUTF8ToJavaString(
env, GetPrefService()->GetString(prefs::kDownloadDefaultDirectory));
}
static void JNI_PrefServiceBridge_SetDownloadAndSaveFileDefaultDirectory(
JNIEnv* env,
const JavaParamRef<jobject>& obj,
const JavaParamRef<jstring>& directory) {
base::FilePath path(ConvertJavaStringToUTF8(env, directory));
GetPrefService()->SetFilePath(prefs::kDownloadDefaultDirectory, path);
......@@ -1043,8 +928,7 @@ static void JNI_PrefServiceBridge_SetDownloadAndSaveFileDefaultDirectory(
}
static jboolean JNI_PrefServiceBridge_GetExplicitLanguageAskPromptShown(
JNIEnv* env,
const JavaParamRef<jobject>& obj) {
JNIEnv* env) {
std::unique_ptr<translate::TranslatePrefs> translate_prefs =
ChromeTranslateClient::CreateTranslatePrefs(GetPrefService());
return translate_prefs->GetExplicitLanguageAskPromptShown();
......@@ -1052,7 +936,6 @@ static jboolean JNI_PrefServiceBridge_GetExplicitLanguageAskPromptShown(
static void JNI_PrefServiceBridge_SetExplicitLanguageAskPromptShown(
JNIEnv* env,
const JavaParamRef<jobject>& obj,
jboolean shown) {
std::unique_ptr<translate::TranslatePrefs> translate_prefs =
ChromeTranslateClient::CreateTranslatePrefs(GetPrefService());
......@@ -1067,7 +950,6 @@ const char* PrefServiceBridge::GetPrefNameExposedToJava(int pref_index) {
static void JNI_PrefServiceBridge_SetForceWebContentsDarkModeEnabled(
JNIEnv* env,
const JavaParamRef<jobject>& obj,
jboolean enabled) {
GetPrefService()->SetBoolean(prefs::kWebKitForceDarkModeEnabled, enabled);
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment