From cad43c97fd89b71da9e3f00d1aa0322a5ffad5b3 Mon Sep 17 00:00:00 2001
From: "kmadhusu@chromium.org"
<kmadhusu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Fri, 17 Dec 2010 22:17:57 +0000
Subject: DOMUI Settings: UTH: Remove the 'Reset to Defaults' button.
BUG=66115
TEST=none
Review URL: http://codereview.chromium.org/6017002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69581 0039d316-1c4b-4281-b951-d872f2087c98
---
chrome/app/chromium_strings.grd | 1 +
chrome/app/generated_resources.grd | 1 +
chrome/app/google_chrome_strings.grd | 1 +
chrome/browser/dom_ui/options/advanced_options_handler.cc | 15 ---------------
chrome/browser/dom_ui/options/advanced_options_handler.h | 4 ----
chrome/browser/resources/options/advanced_options.html | 3 ---
chrome/browser/resources/options/advanced_options.js | 7 -------
chrome/browser/ui/options/options_util.h | 2 ++
8 files changed, 5 insertions(+), 29 deletions(-)
diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd
index c30ea42..2d86fa2 100644
--- a/chrome/app/chromium_strings.grd
+++ b/chrome/app/chromium_strings.grd
@@ -302,6 +302,7 @@ be available for now. -->
Please sign out of Chromium OS and sign in again for this change to take effect.
</message>
</if>
+ <!--TODO(kmadhusu): Remove "IDS_OPTIONS_RESET_MESSAGE" after platform-specific dialogs are removed.-->
<message name="IDS_OPTIONS_RESET_MESSAGE" desc="The message shown when the user presses the 'Reset Chrome options' button">
When you reset Chromium options any changes you've made will be reverted to the default settings. Do you want to reset Chromium options?
</message>
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 73d4103..a1e7ce5 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -8004,6 +8004,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
Correct spelling automatically:
</message>
+ <!-- TODO(kmadhusu): Remove "IDS_OPTIONS_RESET", "IDS_OPTIONS_RESET_OKLABEL", "IDS_OPTIONS_RESET_CANCELLABEL" after platform-specific dialogs are removed.-->
<if expr="not pp_ifdef('use_titlecase')">
<message name="IDS_OPTIONS_RESET" desc="The label of the 'Reset all settings to defaults' button">
Reset to defaults
diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_strings.grd
index 3d21f5f..68afe21 100644
--- a/chrome/app/google_chrome_strings.grd
+++ b/chrome/app/google_chrome_strings.grd
@@ -349,6 +349,7 @@ Chrome supports. -->
Please sign out of Google Chrome OS and sign in again for this change to take effect.
</message>
</if>
+ <!--TODO(kmadhusu): Remove "IDS_OPTIONS_RESET_MESSAGE" after platform-specific dialogs are removed.-->
<message name="IDS_OPTIONS_RESET_MESSAGE" desc="The message shown when the user presses the 'Reset Chrome options' button">
When you reset Google Chrome options any changes you've made will be reverted to the default settings. Do you want to reset Chrome options?
</message>
diff --git a/chrome/browser/dom_ui/options/advanced_options_handler.cc b/chrome/browser/dom_ui/options/advanced_options_handler.cc
index 5243c54..486c2dd 100644
--- a/chrome/browser/dom_ui/options/advanced_options_handler.cc
+++ b/chrome/browser/dom_ui/options/advanced_options_handler.cc
@@ -173,14 +173,6 @@ void AdvancedOptionsHandler::GetLocalizedValues(
l10n_util::GetStringUTF16(IDS_OPTIONS_IMPROVE_BROWSING_EXPERIENCE));
localized_strings->SetString("disableWebServices",
l10n_util::GetStringUTF16(IDS_OPTIONS_DISABLE_WEB_SERVICES));
- localized_strings->SetString("optionsReset",
- l10n_util::GetStringUTF16(IDS_OPTIONS_RESET));
- localized_strings->SetString("optionsResetMessage",
- l10n_util::GetStringUTF16(IDS_OPTIONS_RESET_MESSAGE));
- localized_strings->SetString("optionsResetOkLabel",
- l10n_util::GetStringUTF16(IDS_OPTIONS_RESET_OKLABEL));
- localized_strings->SetString("optionsResetCancelLabel",
- l10n_util::GetStringUTF16(IDS_OPTIONS_RESET_CANCELLABEL));
}
void AdvancedOptionsHandler::Initialize() {
@@ -239,9 +231,6 @@ void AdvancedOptionsHandler::RegisterMessages() {
dom_ui_->RegisterMessageCallback("autoOpenFileTypesAction",
NewCallback(this,
&AdvancedOptionsHandler::HandleAutoOpenButton));
- dom_ui_->RegisterMessageCallback("resetToDefaults",
- NewCallback(this,
- &AdvancedOptionsHandler::HandleResetToDefaults));
dom_ui_->RegisterMessageCallback("defaultZoomLevelAction",
NewCallback(this, &AdvancedOptionsHandler::HandleDefaultZoomLevel));
#if !defined(OS_CHROMEOS)
@@ -341,10 +330,6 @@ void AdvancedOptionsHandler::HandleAutoOpenButton(const ListValue* args) {
manager->download_prefs()->ResetAutoOpen();
}
-void AdvancedOptionsHandler::HandleResetToDefaults(const ListValue* args) {
- OptionsUtil::ResetToDefaults(dom_ui_->GetProfile());
-}
-
void AdvancedOptionsHandler::HandleMetricsReportingCheckbox(
const ListValue* args) {
#if defined(GOOGLE_CHROME_BUILD) && !defined(OS_CHROMEOS)
diff --git a/chrome/browser/dom_ui/options/advanced_options_handler.h b/chrome/browser/dom_ui/options/advanced_options_handler.h
index d75d358..6b1cb0a 100644
--- a/chrome/browser/dom_ui/options/advanced_options_handler.h
+++ b/chrome/browser/dom_ui/options/advanced_options_handler.h
@@ -51,10 +51,6 @@ class AdvancedOptionsHandler
// remove all auto-open file-type settings.
void HandleAutoOpenButton(const ListValue* args);
- // Callback for the "resetToDefaults" message. This will ask the user if
- // they want to reset all options to their default values.
- void HandleResetToDefaults(const ListValue* args);
-
// Callback for the "metricsReportingCheckboxAction" message. This is called
// if the user toggles the metrics reporting checkbox.
void HandleMetricsReportingCheckbox(const ListValue* args);
diff --git a/chrome/browser/resources/options/advanced_options.html b/chrome/browser/resources/options/advanced_options.html
index a1c8858..758e06c 100644
--- a/chrome/browser/resources/options/advanced_options.html
+++ b/chrome/browser/resources/options/advanced_options.html
@@ -187,7 +187,4 @@
</div>
</section>
</if>
- <div class="button-strip">
- <button id="optionsReset" i18n-content="optionsReset"></button>
- </div>
</div>
diff --git a/chrome/browser/resources/options/advanced_options.js b/chrome/browser/resources/options/advanced_options.js
index e298ef1..ce7c238 100644
--- a/chrome/browser/resources/options/advanced_options.js
+++ b/chrome/browser/resources/options/advanced_options.js
@@ -60,13 +60,6 @@ var OptionsPage = options.OptionsPage;
chrome.send('defaultZoomLevelAction',
[String(event.target.options[event.target.selectedIndex].value)]);
}
- $('optionsReset').onclick = function(event) {
- AlertOverlay.show(undefined,
- localStrings.getString('optionsResetMessage'),
- localStrings.getString('optionsResetOkLabel'),
- localStrings.getString('optionsResetCancelLabel'),
- function() { chrome.send('resetToDefaults'); });
- }
if (cr.isWindows || cr.isMac) {
$('certificatesManageButton').onclick = function(event) {
diff --git a/chrome/browser/ui/options/options_util.h b/chrome/browser/ui/options/options_util.h
index 5280051..fb2b183 100644
--- a/chrome/browser/ui/options/options_util.h
+++ b/chrome/browser/ui/options/options_util.h
@@ -12,6 +12,8 @@ class Profile;
class OptionsUtil {
public:
+ // TODO(kmadhusu): Remove "ResetToDefaults" function after platform-specific
+ // dialogs are removed.
// Resets all prefs to their default values.
static void ResetToDefaults(Profile* profile);
--
cgit v1.1