summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvasilii@chromium.org <vasilii@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-11 10:57:00 +0000
committervasilii@chromium.org <vasilii@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-11 10:57:00 +0000
commitf1ef8f759aaa4216a94fdfc9860f183680c7f7f7 (patch)
tree22bf69001ea97abdcf9d916f3aa56eef2d0dabf5
parenteb1dc4eb609edb40a37a82f4b3226da54d87a0a9 (diff)
downloadchromium_src-f1ef8f759aaa4216a94fdfc9860f183680c7f7f7.zip
chromium_src-f1ef8f759aaa4216a94fdfc9860f183680c7f7f7.tar.gz
chromium_src-f1ef8f759aaa4216a94fdfc9860f183680c7f7f7.tar.bz2
Profile Reset: new URL and description in the dialog.
BUG=235037 Review URL: https://chromiumcodereview.appspot.com/18672004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211063 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/app/generated_resources.grd3
-rw-r--r--chrome/browser/resources/options/reset_profile_settings_overlay.css2
-rw-r--r--chrome/browser/resources/options/reset_profile_settings_overlay.html4
-rw-r--r--chrome/browser/ui/webui/options/reset_profile_settings_handler.cc3
4 files changed, 9 insertions, 3 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 5a80ac4..662e906 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -15574,6 +15574,9 @@ Do you accept?
<message name="IDS_RESET_PROFILE_SETTINGS_DESCRIPTION" desc="A label describing the purpose of the 'reset profile settings' feature">
Things got out of control? Revert your Chrome profile to a clean, post install state.
</message>
+ <message name="IDS_RESET_PROFILE_SETTINGS_EXPLANATION" desc="A label describing the consequences of the 'reset profile settings' feature">
+ Your browser settings will be restored to their original defaults. This will reset your homepage, new tab page, and search engine, disable your extensions and clear your cookies, content settings and site data.
+ </message>
<message name="IDS_RESET_PROFILE_SETTINGS_BUTTON" desc="The text on the button in chrome://settings that allows resetting some settings in a profile">
Reset profile settings...
</message>
diff --git a/chrome/browser/resources/options/reset_profile_settings_overlay.css b/chrome/browser/resources/options/reset_profile_settings_overlay.css
index b78ade2..9fa3b8e 100644
--- a/chrome/browser/resources/options/reset_profile_settings_overlay.css
+++ b/chrome/browser/resources/options/reset_profile_settings_overlay.css
@@ -3,7 +3,7 @@
* found in the LICENSE file. */
#reset-profile-settings-overlay {
- min-width: 500px;
+ width: 500px;
}
#reset-profile-settings-throbber {
diff --git a/chrome/browser/resources/options/reset_profile_settings_overlay.html b/chrome/browser/resources/options/reset_profile_settings_overlay.html
index 138ffb8..f0150c6 100644
--- a/chrome/browser/resources/options/reset_profile_settings_overlay.html
+++ b/chrome/browser/resources/options/reset_profile_settings_overlay.html
@@ -1,7 +1,9 @@
<div id="reset-profile-settings-overlay" class="page" hidden>
<div class="close-button"></div>
<h1 i18n-content="resetProfileSettingsOverlay"></h1>
- <div id="reset-profile-settings-content-area" class="content-area"></div>
+ <div id="reset-profile-settings-content-area" class="content-area">
+ <span i18n-content="resetProfileSettingsExplanation"></span>
+ </div>
<div class="action-area">
<div class="hbox stretch">
<a target="_blank" i18n-content="learnMore"
diff --git a/chrome/browser/ui/webui/options/reset_profile_settings_handler.cc b/chrome/browser/ui/webui/options/reset_profile_settings_handler.cc
index 49f9bdc..e2650fc 100644
--- a/chrome/browser/ui/webui/options/reset_profile_settings_handler.cc
+++ b/chrome/browser/ui/webui/options/reset_profile_settings_handler.cc
@@ -21,7 +21,7 @@
namespace {
const char kResetProfileSettingsLearnMoreUrl[] =
- "https://support.google.com/chrome/?p=settings_reset_profile_settings";
+ "https://support.google.com/chrome/?p=ui_reset_settings";
} // namespace
namespace options {
@@ -43,6 +43,7 @@ void ResetProfileSettingsHandler::GetLocalizedValues(
static OptionsStringResource resources[] = {
{ "resetProfileSettingsCommit", IDS_RESET_PROFILE_SETTINGS_COMMIT_BUTTON },
+ { "resetProfileSettingsExplanation", IDS_RESET_PROFILE_SETTINGS_EXPLANATION}
};
RegisterStrings(localized_strings, resources, arraysize(resources));