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.

Sign up for GitHub

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

Jump to bottom

Fixes Reset Profile dialog. #2329

Merged
merged 1 commit into from
Apr 25, 2019
Merged

Fixes Reset Profile dialog. #2329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 browser/resources/settings/brave_reset_page/brave_reset_profile_dialog_behavior.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<script src="brave_reset_profile_dialog_behavior.js"></script>
23 changes: 23 additions & 0 deletions browser/resources/settings/brave_reset_page/brave_reset_profile_dialog_behavior.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
/* Copyright (c) 2019 The Brave Authors. All rights reserved.
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */

BraveResetProfileDialogBehavior = {

ready: function() {
this.fixSendSettingsCheckbox();
},

/**
* Unchecks, disables, and hides sendSettings checkbox.
* Also, hide the entire footer.
* @private
*/
fixSendSettingsCheckbox: function() {
this.$.sendSettings.checked = false;
this.$.sendSettings.hidden = true;
this.$.sendSettings.disabled = true;
this.$.sendSettings.parentNode.hidden = true;
},
};
1 change: 1 addition & 0 deletions browser/resources/settings/brave_settings_overrides.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<link rel="import" href="chrome://brave-resources/polymer_overriding.html">
<link rel="import" href="brave_clear_browsing_data_dialog/brave_clear_browsing_data_dialog_behavior.html">
<link rel="import" href="brave_reset_page/brave_reset_profile_dialog_behavior.html">
<!-- Need chromium icons to be defined so that we can rewrite -->
<link rel="import" href="icons.html">
<link rel="import" href="brave_icons.html">
Expand Down
3 changes: 3 additions & 0 deletions browser/resources/settings/brave_settings_overrides.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,9 @@ BravePatching.RegisterPolymerComponentBehaviors({
'settings-clear-browsing-data-dialog': [
BraveClearBrowsingDataOnExitBehavior
],
'settings-reset-profile-dialog': [
BraveResetProfileDialogBehavior
],
'settings-ui': [
BraveClearSettingsMenuHighlightBehavior
]
Expand Down
2 changes: 2 additions & 0 deletions browser/resources/settings/settings_resources.grd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@
<structure name="IDR_SETTINGS_BRAVE_CLEAR_BROWSING_DATA_ON_EXIT_PAGE_JS" file="brave_clear_browsing_data_dialog/brave_clear_browsing_data_on_exit_page.js" type="chrome_html" preprocess="true" />
<structure name="IDR_SETTINGS_BRAVE_CLEAR_BROWSING_DATA_DIALOG_BEHAVIOR_HTML" file="brave_clear_browsing_data_dialog/brave_clear_browsing_data_dialog_behavior.html" type="chrome_html" preprocess="true" allowexternalscript="true" />
<structure name="IDR_SETTINGS_BRAVE_CLEAR_BROWSING_DATA_DIALOG_BEHAVIOR_JS" file="brave_clear_browsing_data_dialog/brave_clear_browsing_data_dialog_behavior.js" type="chrome_html" preprocess="true" />
<structure name="IDR_SETTINGS_BRAVE_RESET_PROFILE_DIALOG_BEHAVIOR_HTML" file="brave_reset_page/brave_reset_profile_dialog_behavior.html" type="chrome_html" preprocess="true" allowexternalscript="true" />
<structure name="IDR_SETTINGS_BRAVE_RESET_PROFILE_DIALOG_BEHAVIOR_JS" file="brave_reset_page/brave_reset_profile_dialog_behavior.js" type="chrome_html" preprocess="true" />
<!-- brave sync -->
<structure name="IDR_SETTINGS_BRAVE_SYNC_BROWSER_PROXY_HTML" file="brave_sync_page/brave_sync_browser_proxy.html" type="chrome_html" />
<structure name="IDR_SETTINGS_BRAVE_SYNC_BROWSER_PROXY_JS" file="brave_sync_page/brave_sync_browser_proxy.js" type="chrome_html" preprocess="true" />
Expand Down
17 changes: 0 additions & 17 deletions patches/chrome-browser-resources-settings-reset_page-reset_profile_dialog.html.patch
View file
Open in desktop

This file was deleted.

22 changes: 0 additions & 22 deletions patches/chrome-browser-resources-settings-reset_page-reset_profile_dialog.js.patch
View file
Open in desktop

This file was deleted.