Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #12492: Disable idle detection API #7054

Merged
merged 1 commit into from
Nov 6, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/brave_main_delegate.cc
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,7 @@ bool BraveMainDelegate::BasicStartupComplete(int* exit_code) {
autofill::features::kAutofillServerCommunication.name,
blink::features::kTextFragmentAnchor.name,
features::kAllowPopupsDuringPageUnload.name,
features::kIdleDetection.name,
features::kNotificationTriggers.name,
features::kPrivacySettingsRedesign.name,
features::kSignedExchangeSubresourcePrefetch.name,
Expand Down
1 change: 1 addition & 0 deletions app/brave_main_delegate_browsertest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ IN_PROC_BROWSER_TEST_F(BraveMainDelegateBrowserTest, DisabledFeatures) {
&autofill::features::kAutofillServerCommunication,
&blink::features::kTextFragmentAnchor,
&features::kAllowPopupsDuringPageUnload,
&features::kIdleDetection,
&features::kNotificationTriggers,
&features::kPrivacySettingsRedesign,
&features::kSignedExchangeSubresourcePrefetch,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ public class BraveSiteSettingsPreferencesBase extends SiteSettingsPreferenceFrag
private static final String BACKGROUND_SYNC_KEY = "background_sync";
private static final String PLAY_YT_VIDEO_IN_BROWSER_KEY = "play_yt_video_in_browser";
private static final String DESKTOP_MODE_KEY = "desktop_mode";
private static final String IDLE_DETECTION = "idle_detection";

private final HashMap<String, Preference> mRemovedPreferences = new HashMap<>();

Expand Down Expand Up @@ -65,6 +66,7 @@ private void removePreferenceIfPresent(String key) {
}

private void configureBravePreferences() {
removePreferenceIfPresent(IDLE_DETECTION);
removePreferenceIfPresent(ADS_KEY);
removePreferenceIfPresent(BACKGROUND_SYNC_KEY);
}
Expand Down